Re: undoing a merge

[kf...@collab.net]

"Wadsworth, Eric (Contractor)" <wa...@fhu.disa.mil> writes:
> I do "svn up" and one of my files gets merged with what is in the
> repository. Six seconds later, I decide that I need my original wc file
> back, as it was before the merge.
> 
> Is there a way to do this? Some way to configure subversion to make backups
> of my wc files before altering them?

It does this by default, I thought?  Look in that directory -- is
there a file there with a similar name, but ending in ".mine" or
something?

-Karl


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: undoing a merge

[kf...@collab.net]

kfogel@collab.net writes:
> > Is there a way to do this? Some way to configure subversion to make backups
> > of my wc files before altering them?
> 
> It does this by default, I thought?  Look in that directory -- is
> there a file there with a similar name, but ending in ".mine" or
> something?

Sorry, Ben's right.  Ignore me; I read "merge" instead of "up".

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: undoing a merge

[kf...@collab.net]

kfogel@collab.net writes:
> > Is there a way to do this? Some way to configure subversion to make backups
> > of my wc files before altering them?
> 
> It does this by default, I thought?  Look in that directory -- is
> there a file there with a similar name, but ending in ".mine" or
> something?

Sorry, Ben's right.  Ignore me; I read "merge" instead of "up".

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org