> -----Original Message-----
> From: Graham Bartlett [mailto:ratelect_at_hotmail.com]
> Sent: Wednesday, August 06, 2008 10:57 AM
> To: users_at_subversion.tigris.org
> Subject: Replacing branch contents with another branch
>
>
> A workaround is that I delete my entire working branch, commit that,
> and then rebranch from trunk - possibly using the same name for the
> working branch, or possibly using a different branch name. That gets
> me working, but it's a very nasty hack. The most significant problem
> is that I lose version history from my pre-merged personal branch to
my
> post-merged personal branch, so if I want to check what changed when I
> pulled down the latest version, that is not possible.
Another possible solution might be to unmerge (reverse merge)
your code changes to get back to the original copy of trunk and then
merge from trunk. In theory, you keep all your merge history on one
branch and otherwise don't have to deal with peg revisions/branches.
> The most significant problem
> is that I lose version history from my pre-merged personal branch to
my
> post-merged personal branch, so if I want to check what changed when I
> pulled down the latest version, that is not possible.
Not true. The information is there, but it's a pain to get the
information since you have to remember/find all the peg branches and
query on each branch for merge information. (This is for 1.4, no idea
if 1.5 makes it easy to get merge info from peg branches or not.) On a
side note, does svnmerge.py handle peg branches?
*****
The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA621
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-06 19:30:42 CEST