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

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

From: Ryan J Ollos <ryano_at_physiosonics.com>
Date: Fri, 19 Aug 2011 17:49:03 -0700 (PDT)

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:


Shouldn't there be an option to "Delete the local file"?

The way it is described in the documentation " 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.

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

View this message in context: http://old.nabble.com/No-option-to-delete-local-file-in-Tree-Conflict-dialog-%28and-peg-revision-in-dialog-is-incorrect%29-tp32299397p32299397.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-20 02:49:07 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.