Hi Han, Be very careful! You only need to initialise svnmerge once at the very start on a branch, not every time you want to merge in the changes from the main line. For updating a branch, you only need to type 2 commands: $ svnmerge.py merge Fix the conflicts, if any, and then: $ svn ci -F svnmerge-commit-message.txt I hope like last time this commit won't cause any problems :S Regards, Edward On 1 August 2011 17:39, <hasu@xxxxxxxxxxxxxxxxx> wrote:
Author: han87 Date: Mon Aug 1 17:39:06 2011 New Revision: 14039 URL: http://svn.gna.org/viewcvs/relax?rev=14039&view=rev Log: Initialized merge tracking via "svnmerge" with revisions "1-12830" from svn+ssh://han87@xxxxxxxxxxx/svn/relax/1.3 Modified: branches/xyz/ (props changed) Propchange: branches/xyz/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Mon Aug 1 17:39:06 2011 @@ -1,1 +1,1 @@ -/1.3:1-13944 +/1.3:1-13944 /1.3:1-12830 _______________________________________________ relax (http://nmr-relax.com) This is the relax-commits mailing list relax-commits@xxxxxxx To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-commits