Re: r13944 - /branches/xyz/ -- July 28, 2011 - 10:45

Hi,

I did exact the same as it is written in manual:

1.  $ svnmerge.py init 

2.  svn ci -F svnmerge-commit-message.txt

3. After I typed "svnmerge.py merge" it showed one conflict.

Is there something wrong?

Best

Han 

On Jul 28, 2011, at 10:35 AM, Edward d'Auvergne wrote:

Ouch, how was that possible?  Merge tracking is already initialised on

the xyz branch.  This commit might cause some serious headaches :S

And reverting it might also be problematic :S

Regards,

Edward

On 28 July 2011 10:15,  <hasu@xxxxxxxxxxxxxxxxx> wrote:

Author: han87

Date: Thu Jul 28 10:15:38 2011

New Revision: 13944

URL: http://svn.gna.org/viewcvs/relax?rev=13944&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 Thu Jul 28 10:15:38 2011

@@ -1,1 +1,1 @@

-/1.3:1-12935

+/1.3:1-12830 /1.3:1-12935

_______________________________________________

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

_______________________________________________

relax (http://nmr-relax.com)

This is the relax-devel mailing list

relax-devel@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-devel