On Mar 27, 2009, at 9:21 PM, Branko Čibej wrote:
Eric Covener wrote:
On Fri, Mar 27, 2009 at 4:00 PM, Branko Čibej <[email protected]> wrote:
Eric Covener wrote:
See the unrelated revisions showing up here:
http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/ab.c?view=log
is this related to the "svnmergeinfo" in his commit messages?
I don't see anything wrong there.
The top of the listing are all changes for other components that hit
ab.c with a propchange, that makes the viewvc output for ab.c full of
n/a revisions.
Those must've been merges. This could be a ViewVC issue, but I'm not
familiar enough with it to make a call.
When I backport, I do a full svn merge using the below:
#!/bin/bash
# svn.merge: tool for merging into a branch a number of specified
# revisions from the trunk.
#
# Usage: (from a branch working copy)
# $ svn.merge 200 203 210 220
# $ vi clog ### adjust if necessary
# $ svn ci -F clog
# merges the specified revisions from into the wc and creates a
# suitable changelog.
LOGNAME="jim"
trunk=`svn info . | gsed -n '/^URL/{s,branches/.*,trunk,;s/
^URL: //;s,tc6.0.x/,,;p}'`
revs=
for rev in $*; do
test -n "$revs" && revs="${revs}, "
revs="${revs}r${rev}"
prev=$(($rev - 1))
echo + svn merge -r${prev}:${rev} ${trunk}
svn merge -r${prev}:${rev} ${trunk} || exit 1
done
test -f clog && mv -f clog clog~
echo Merge ${revs} from trunk: > clog
author=
for rev in $*; do
echo + svn log -r${rev} ${trunk}
svn log -r${rev} ${trunk} | gsed '1,2d;$d' >> clog
echo + svn propget svn:author ...
rauth=`svn propget svn:author --revprop -r ${rev} ${trunk}`
test -z "${author}" && author="${rauth}"
test "${rauth}" != "${author}" && author="${author}, ${rauth}"
done
if test x$author != x$LOGNAME; then
echo Submitted by: $author >> clog
fi
echo Reviewed/backported by: $LOGNAME >> clog
cat clog
