Hi, Try to perform the 'svnmerge.py merge' update process and see what happens. Before committing the update, check with 'svn st' that there is no conflicts on '.' as that would be hard to fix and prevent me from merging the branch back into the 1.3 line. If everything is ok, then commit it (with the -F flag so the svnmerge commit message is used), and then write a post asking for the branch to be merged. It would be best to start a new thread (i.e. not replying to a mail) for this.
Cheers, Edward On 2 August 2011 09:40, Han Sun <[email protected]> wrote: > Hi Edwawrd, > > ok, now I get this point. So should I update this again now or do you think > it already fine? > > Best > Han > > On Aug 1, 2011, at 5:53 PM, Edward d'Auvergne wrote: > >> 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, <[email protected]> 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://[email protected]/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 >>> [email protected] >>> >>> 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 >>> >> >> _______________________________________________ >> relax (http://nmr-relax.com) >> >> This is the relax-devel mailing list >> [email protected] >> >> 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-devel > > _______________________________________________ relax (http://nmr-relax.com) This is the relax-devel mailing list [email protected] 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-devel
