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

Re: Comments to the new interactive merge

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Thu, 05 Jun 2008 08:25:44 -0400

Jens Seidel wrote:
> Hi,
> I tried the 1.5 RC8 snapshot and noticed some minor issues with the new
> interactive merge and conflict resolution.
> The editor is called with a filename such as tempfile.35.tmp. At least
> in my vim configuration it doesn't use syntax highlighting per default
> because of the .tmp suffix. This makes it also harder to guess the
> filename which contains the conflict. Yep, Subversion displayed it but I
> don't always remember which makes it more difficult to check the changes
> in ViewCV. It could be an option to open the editor in a tmpdir.35.svn/
> subdirectory with the same directory structure as the current working
> copy.

I filed this some time ago as issue #3166.

> I'm curious: There is no way to stop the interactive merge? Is it save
> to interrupt with Ctrl+C? I miss a menu item which applies the next
> (or previous) action on all conflicts (skip all, edit all, mine-full for
> all).

Ooh... yah, that'd be nice.

C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-06-05 14:25:58 CEST

This is an archived mail posted to the Subversion Dev mailing list.

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