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.
It would also be nice if the filename of the conflicted file whould be
displayed after the initial output as well, maybe infront of the menu
or in the help menu.
I would also like to see a list of resolved conflicts at end to be able
to check the current diff in these files as well. In the past I edited
conflicts via a simple svn diff <-> vimdiff wrapper and could always
look at the command line for effected files. That's no longer possible.
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).
Jens
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-05 13:21:54 CEST