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

Re: Conflict resolver: say what status the Resolved option will give

From: Julian Foad <julianfoad_at_apache.org>
Date: Tue, 11 Jul 2017 21:43:21 +0100

Stefan Sperling wrote:
> On Tue, Jul 11, 2017 at 04:33:37PM +0100, Julian Foad wrote:
>> An improvement would be to show the pending status, perhaps like this:
>>
>> ...
>>> A file scheduled to be added to the repository in the next commit was found in the working copy.
>>> Pending status of the file is:
>>> RM subversion/svn/shelve-cmd.c
>>> Select: (p) Postpone, (r) Mark as resolved, (m) Merge the files, (h) Help,
>> ...
>>
>> Certainly for tree conflicts I expect seeing the pending status would always
>> be useful; also for non-tree conflicts I expect it would often be useful.
>
> Sure. I like the idea.
>
> Perhaps 'pending' is not the best way to describe this status, though.
> I think there should be a clear connection between the '(r) Mark as resolved'
> option and this status.

Ack. Perhaps "The current/working resolution (which you can accept with
(r)) is: ..."?

> BTW, why didn't you pick the 'm' option? The new resolver is set up so
> that 'm' will usually do what you want :-)

Because I didn't know that, and because I wanted to choose an option as
close as possible to "do nothing, just let the file be as it is or was".

- Julian
Received on 2017-07-11 22:43:26 CEST

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