Julian Foad <julianfoad@btopenworld.com> writes:
> kfogel@collab.net wrote:
> > So now the working copy has a local mod [Q->C]. Yet if you revert it,
> > you don't go back to the original local mod, [Q->A]. Instead, you go
> > back to just [Q]! The original local mod is "lost".
>
> Excuse me for jumping in, but what do you mean by "revert" such that
> you would expect local modifications to be preserved by it? The
> Subversion command-line client's "revert" command is explicitly
> intended to get rid of local modifications.
I think what I meant is, there's no way to revert just the merge. You
can revert, but you'll roll back not only the result of the merge, but
any local changes you had before the merge.
Of course, now that you mention it, there *is* a way: run the merge in
reverse. So maybe my whole point was wrong, oops.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 5 19:09:12 2005