Diego Novillo wrote:
On Tuesday 03 January 2006 12:17, [EMAIL PROTECTED] wrote:
how to keep my branch updated with the mainline?
The easiest way is using svnmerge.py (included in SVN's contrib directory).
There's documentation in the GCC wiki: http://gcc.gnu.org/wiki/SvnBranch
Just tried these instructions on the reload-branch, and it doesn't
appear to be working as documented:
[EMAIL PROTECTED]:/local/src/egcs/reload-branch> svnmerge.py init
property 'svnmerge-integrated' set on '.'
[EMAIL PROTECTED]:/local/src/egcs/reload-branch> svn status
? svnmerge-commit-message.txt
M .
[EMAIL PROTECTED]:/local/src/egcs/reload-branch> cat
svnmerge-commit-message.txt
Initialized merge tracking via "svnmerge" with revisions "1-96656" from
svn+ssh://gcc.gnu.org/svn/gcc/branches/CYGNUS/libjava/testsuite/libjava.lang/Invoke_1.out
[EMAIL PROTECTED]:/local/src/egcs/reload-branch> svn diff
Property changes on: .
___________________________________________________________________
Name: svnmerge-integrated
+ /branches/CYGNUS/libjava/testsuite/libjava.lang/Invoke_1.out:1-96656
[EMAIL PROTECTED]:/local/src/egcs/reload-branch> svn commit -F
svnmerge-commit-message.txt
Sending .
Committed revision 109540.
[EMAIL PROTECTED]:/local/src/egcs/reload-branch> rm
svnmerge-commit-message.txt
[EMAIL PROTECTED]:/local/src/egcs/reload-branch> cd ..
[EMAIL PROTECTED]:/local/src/egcs> cp -a reload-branch/ reload-branch-merged
[EMAIL PROTECTED]:/local/src/egcs> cd reload-branch-merged/
[EMAIL PROTECTED]:/local/src/egcs/reload-branch-merged> svnmerge.py avail
[EMAIL PROTECTED]:/local/src/egcs/reload-branch-merged> svnmerge.py
avail --diff
[EMAIL PROTECTED]:/local/src/egcs/reload-branch-merged>
Help?
(The "commit -F/rm" combination seems a bit arcane to me, what exactly
am I doing there?)
Bernd
