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

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.

BTW, why didn't you pick the 'm' option? The new resolver is set up so
that 'm' will usually do what you want :-)
Received on 2017-07-11 21:35:15 CEST