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

Re: [RFC] Subversion command line UI for interactive conflict resolution

From: Evgeny Kotkov <evgeny.kotkov_at_visualsvn.com>
Date: Thu, 13 Oct 2016 16:24:19 +0300

Ivan Zhakov <ivan_at_visualsvn.com> writes:

> I suggest to change behavior to something like the following:
> [[[
> $ svn resolve
> Searching tree conflict details for
> 'D:\ivan\svn\test-wc\add-versus-add\foo' in repository:
> Checking r5... done
> Tree conflict on 'D:\ivan\svn\test-wc\add-versus-add\foo':
> File merged from '^/trunk/foo_at_2' to '^/branches/b1/foo_at_16' was moved
> to '^/branches/b1/bar' by ivan in r5.
> A file which differs from the corresponding file on the merge source
> branch was found in the working copy.
> Resolution options:
> (p) - postpone
> (r) - mark as resolved
> (m) - move and merge
> (h) - help
> (q) - postpone all remaining conflicts

I'd love to see the layout like this:

 Resolution options:
   (p) Postpone
   (r) Mark as resolved
   (m) Move and merge
   (h) Help
   (q) Postpone all remaining conflicts

Which changes to this, if the user selects "Help":

 Resolution options:
   (p) Postpone (skip this conflict and leave it unresolved) [postpone]
   (r) Mark as resolved (accept current working copy state) [working]
   (m) Move and merge (move '^/subversion/trunk/subversion/libsvn_client/foo'
       to 'subversion\libsvn_client\bar' and merge)
   (h) Help
   (q) Postpone all remaining conflicts

Evgeny Kotkov
Received on 2016-10-13 15:24:46 CEST

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