[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: undoing a merge

From: Wadsworth, Eric (Contractor) <wadswore_at_fhu.disa.mil>
Date: 2003-12-19 18:06:03 CET

> > Isn't there a small gotcha here? If parts of his local
> changes matched
> > the changes from the new version, then wouldn't those be lost?
>
> That's true, yes!

Damn.

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

My developers have requested that they be able to undo a harmful merge. I
have already emailed them outlining the procedure, but I must now retract.

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.

--- Eric

---------------------------------------------------------------------
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:09:43 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.