RE: Cleanup merge-info in source

[Adrian Shum <tc...@taifook.com>]

Thanks for previous replies from Tyler,
 
In fact after searching the mailing list briefly I cannot find a
concrete answer,
maybe I shall change my question a bit:
 
(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 ?
 
Thanks a lot
 
Adrian

-----Original Message-----
From: Adrian Shum 
Sent: Tuesday, June 16, 2009 7:17 PM
To: 'users@subversion.tigris.org'
Subject: Cleanup merge-info in source


(Sorry I think I made some wrong statements in my previous email, please
just ignore my previous mail.
Please accept my apology)
 
My trunk has once branched to Branch-A, and I do have some features
merging to-and-fro between
trunk and Branch-A, and incured some file rename.  As a result (I guess
so), some files under trunk contains 
merge-info property related to Branch-A.
 
Later, I created some release branches of trunk (let's say, Rel-1.0).
Whenever I did some cherry-picking
merge from trunk to Rel-1.0, there are always a lot of files (other than
those merged file) being committed to Rel-1.0.
Those files only have changes in merge-info at the line about trunk.
 
These changes are really annoying.  If I am sure that I won't have any
merging between Branch-A and trunk,
is it safe that I simply remove all merge-info of all subdirectory and
files in Branch-A, trunk and Rel-1.0, and 
leave only the merge-info in the top directory? What may be the
consequence of doing this?
 
Thanks a lot
 
Adrian



This email is confidential. If you are not the intended recipient, please delete it from your system and notify the sender immediately. Any unauthorized use, disclosure, dissemination or copying of this email is prohibited. Taifook Securities Group, its group companies and their content providers ("Parties") shall not be responsible for the accuracy or completeness of this email or its attachment, if any, which could contain virus, be corrupted, destroyed, incomplete, intercepted, lost or arrive late.   The Parties do not accept liability for any damage caused by this email.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2382761

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].

Re: Cleanup merge-info in source

[Tyler Roscoe <ty...@cryptio.net>]

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.

tyler

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2382895

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].