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

Re: Feature Request: resolve on update

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-07-26 17:34:33 CEST

Gavin Lambert wrote:
> I've just done an SVN Update, and the status window shows that a file
> was conflicted.
>
> Cool, I double-click it to edit the conflicts, and sort it out using my
> third-party merge tool (not TortoiseMerge). Since it's not SVN-aware
> itself, of course, it doesn't have a "Resolved" button.
>
> So back to the status screen, and I right-click on the file expecting it
> to let me "Mark as resolved". But no, the only options I get are to
> "resolve using theirs" or "resolve using mine", which would throw away
> the merging I just did.
>
> Please add the option to just mark it as resolved in that screen. Sure,
> you can do it later on (in the commit or check for modifications
> screens, or directly to the file), but it's simpler if you can do it at
> the time you're doing the merging.

Done in revision 7139.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Jul 26 17:34:45 2006

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