[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Cleanup merge-info in source

From: Tyler Roscoe <tyler_at_cryptio.net>
Date: Wed, 12 Aug 2009 06:36:40 -0700

On Wed, Aug 12, 2009 at 11:40:19AM +0800, Adrian Shum wrote:
> (Assume Branch-X is a branch directly copied from Trunk )
> By keeping merge-info ONLY in the top directory in Trunk and Branch-X
> (i.e. removing merge-info from all sub-directories /files), is that
> enough for
> future merge trackings between Trunk and Branch-X ?

If you do all your merges from the top of trunk and the top of branch-x,
then yes, this will work.

If you do subtree merges, I'm not sure, so I would test it out. Check
out some fresh working copies and do a couple test merges to see what
the behavior is.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-12 15:37:37 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.