You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Ryan Phillips <ry...@trolocsis.com> on 2009/04/20 23:46:51 UTC
mergeinfo question on sub-trees
A coworker of mine is wondering if the following merge tracking
scenario works as expected...
When a single revision of a repository includes changes to two
sub-directories, will a merge in a single subdirectory correctly
update that subdirectory’s merge-info, but leave the other unmodified?
Further, will a subsequent merge in the parent correctly pull on the
changes in the other sub-directory?
E.g. –
1) http://repos/branches/branch1/sub-dir-1/foo.c is modified and commited
2) http://repos/branches/branch1/sub-dir-2/bar.c is modified and commited
3) In a working copy pointing to http://repos/trunk/sub-dir-1
perform the following command:
# svn merge http://repos/branches/branch1/sub-dir-1/
Q: Will the previous command correctly update all of the merge-info
properties in sub-dir-1?
4) In another working copy pointing to http://repos/trunk perform
the following command:
# svn merge http://repos/branches/branch1
Q: Will command #4 merge the missing revisions for sub-dir-2 and
correctly update all the merge-info for the entire tree?
Regards,
Ryan Phillips
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1832492
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].