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

RE: Reverting an ADD status file after an update tree conflict deletes the file

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Mon, 14 Oct 2013 14:22:14 +0000

> On 11.10.2013 16:09, Bob Archer wrote:
> > This came up as I tested another issue someone reported.
> >
> > Perform the following steps…
> >
> > 1.Edit a file in a working copy
> >
> > 2.Delete that file in the repository (with the repo browser)
> >
> > 3.Update your working copy
> >
> > 4.Edit the tree conflict and specify “keep working copy”
> >
> > 5.The edited file now shows as an add
> >
> > 6.Revert the working copy
> >
> > Observed:
> >
> > The file with the add status is deleted.
> >
> > Expected:
> >
> > The “add” is removed and the file remains. Basically this is the
> > behavior you get when you revert a file that you just added. I would
> > expect reverting an added file to do the same thing whether the file
> > was marked as add from an update or from just adding it.
>
> That's the behavior of the 'svn revert'.
> So I don't think we should change that in TSVN.
>
> Stefan

Why is that the behavior? Doesn't that go against the SVN mantra of do no harm?

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3066298

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-10-14 16:22:21 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

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