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

Re: No option to delete local file in Tree Conflict dialog (and peg revision in dialog is incorrect)

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 20 Aug 2011 10:41:26 +0200

On 20.08.2011 02:49, Ryan J Ollos wrote:
> I'm currently working with the latest nightly builds and updating more than
> once a week. I've seen the issue I'm about to describe a couple of times,
> and will try to setup a batch file to demonstrate the issue if it appears to
> be a valid problem.
>
> The issue occurs when a merge operation tries to delete a file that has been
> edited on the local branch. The last time this happened I grabbed the
> following screen capture:
>
> http://old.nabble.com/file/p32299397/TreeConflict_BadPegRevision.png
> TreeConflict_BadPegRevision.png
>
> Shouldn't there be an option to "Delete the local file"?
>
> The way it is described in the documentation "4.6.3.5. Local edit, incoming
> delete upon merge", it seems like you might want an option to "Delete the
> local file" but keep an unversioned copy for doing the manual merge.

Fixed in r21873.

> A second issue here is that the PEG revisions are not correct. The highest
> revision in my repository is somewhere around 7000.

fixed in r21872.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2826059
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-20 10:42:06 CEST

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