> Until then, the only work-around you have it probably to use svn
> propedit to add your revision to the existing svn:mergeinfo property
> ... carefully.
I've read a lot of the documentation surrounding merge-tracking,
and it's got me pretty scared of modifying svn:mergeinfo by hand. :)
So I've been thinking of two other work-arounds. Can anyone offer
opinions on whether they're likely to get me into more or less trouble
than hand-editing svn:mergeinfo?
Context: repository looks like this, with /branches/my-branch a
copy of /trunk_at_SOME-PAST-REV (made w/ a 1.4 client, if that matters):
/trunk/foo
/bar
/baz
/branches/my-branch/foo
/bar
/baz <-- lots of files and directories under here,
but no changes on the branch
1) Use sparse working copies:
a) To block revisions, 'svn co --depth=empty trunk' and then run
the necessary 'svn merge --record-only' commands in that working copy.
b) For the actual merge, construct a working copy with
--depth=infinite for /trunk/foo and /trunk/bar and --depth=empty for
/baz, and run the merge in it.
2) Do piece-wise merging: instead of running one 'svn merge' command in
a working copy of trunk, run two 'svn merge' commands, one in a working
copy of /trunk/foo and one in a working copy of /trunk/bar (with
appropriate source URLs).
My sense is that (1) is a bit more future-proof, because the
svn:mergeinfo at the root has a better chance of being sensible --
whereas with (2), when some future more-efficient client tries to
construct svn:mergeinfo for the root by eliding the svn:mergeinfo on all
the subdirs, it won't work very well.
Again, thanks for your continued help!
Matt McHenry
412-690-2442 x150
Software Developer
Carnegie Learning, Inc.
Learning By Doing (r)
Helping over 500,000 students in 2,600 schools to succeed in math.
http://www.carnegielearning.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-03 22:25:01 CEST