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

mergeinfo question on sub-trees

From: Ryan Phillips <ryan_at_trolocsis.com>
Date: Mon, 20 Apr 2009 18:46:51 -0500

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_at_subversion.tigris.org].
Received on 2009-04-21 07:17:14 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.