RE: undoing a merge

> So, are we classifying loss of code as a "small gotcha" now?

        It's not, strictly speaking, "lost". It's in the repository,
waiting to be merged into their code.

> Are there plans for a way to undo unwanted merges? We just need a
> backup of the original modified wc file in its pre-merged state.

        That's a lot to ask as a regular process to cover an edge situation.
After all, someone would have had to do a byte-for-byte exact change as
someone else (except possibly for line-endings) to have it lost by the
process Ben mentioned. One byte off and they would have ended up with a
conflict.

Patrick Rusk

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 19 18:22:36 2003