https://bz.mercurial-scm.org/show_bug.cgi?id=6824
Bug ID: 6824
Summary: Provide a more meaningful context during conflicts.
Product: Mercurial
Version: unspecified
Hardware: PC
OS: All
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: jar...@jaraco.com
CC: mercurial-de...@mercurial-scm.org
Python Version: ---
We're finding that our users are consistently confused by the messaging when
resolving conflicts for binary files.
The message looks like this:
```
no tool found to merge file
file 'file' needs to be resolved.
You can keep (l)ocal [dest], take (o)ther [source], or leave (u)nresolved.
What do you want to do?
```
But in many contexts, the user is unaware of the internal implementation of a
particular command like "sync", which rebases changes, so "dest" and "source"
aren't intuitive.
On the other hand, if a merge tool is invoked, a helpful context is emitted
before the merge tool is run.
```
Running merge tool for foo ('some/tool'):
- local (working copy): 984e1e5d Appending a different byte tip
- base (common ancestor): 104fe963 Adding a binary file
- other (merge rev): 14655abc Appending another byte
```
The short hashes and commit messages provides a meaningful context to the user
to be able to rapidly choose a winner, independent of how the two parents were
ordered.
This feature proposes to provide that context prior to prompting the user to
resolve any conflicts.
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
