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

Re: can of worms: custom props in our tree?

From: John Peacock <jpeacock_at_rowman.com>
Date: 2003-11-06 21:51:16 CET

Greg Noel wrote:

> If the tags only existed in the local repository, this all would have
> been moot...

If the tags only exist in the local repository then two people working on the
same branch would not have the same mergepoint information. Here is how it
should work:

USER A: svn copy file:///path/to/repos/projectA/trunk
file:///path/to/repos/projectA/branch/newdev

USER A: svn co file:///path/to/repos/projectA/branch/newdev mydev

[time passes with commits to both branch and trunk]

USER A: svn merge file:///path/to/repos/projectA/trunk
file:///path/to/repos/projectA/branch/newdev

[catch up with the trunk changes, now have mergepoint past initial branch point]

USER B: svn co file:///path/to/repos/projectA/branch/newdev otherdev

[user B makes changes]

If the mergepoint info is in the local sandbox, then User B will not be able to
perform a merge from trunk at this point without checking exactly where each
file was merged with trunk (using 'svn log' for example). User A can just
repeat the same merge command and get only the trunk changes after the last merge.

HTH

John

-- 
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 6 21:51:39 2003

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