i suspect there's an easy way to do this with svn 1.5 but i'm
currently stuck with 1.4 for a while so i'm open to suggestions.
- start with trunk
- to do some specialized work, create branch "b1" and get to
work on "b1"
- after a while, create a more specialized branch off of "b1"
called "b2" and get to work on "b2"
- after a while working on "b2", realize it's a bad name and
"svn rename" it to "c2" instead, continue working on "c2"
- finally done, time to start merging everything back
uh oh.
my first thought is that i want to merge everything on the b2/c2
branch back into b1, then merge *that* back into trunk. but at
this point, how do i get access to the revisions that were on
the former "b2" branch between the time i created it from "b1",
and the time i renamed it to "c2"?
technically, since i renamed "b2" -> "c2", the "b2" branch doesn't
exist anymore. normally, on a branch, i'd ask for the log and
"--stop-on-copy", but that causes the log to stop at the point of
the renaming.
am i making any sense? as i see it, if i have multiple levels
of branching, the normal way to start merging them back in is in
reverse order. but i'm not sure what to do about that "missing"
interval that was part of a branch that no longer exists.
is this something i would solve with peg revisions? thanks.
rday
---------------------------------------------------------------------
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-20 18:06:49 CEST