Page MenuHomePhabricator

log: if there is a merge state, show conflictother for . [WIP]
Needs RevisionPublic

Authored by joerg.sonnenberger on Sep 18 2021, 7:47 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

That looks like a good quality of life improvement!

martinvonz requested changes to this revision.Tue, Sep 21, 12:50 PM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
tests/test-shelve.t
1420–1432

Hmm, I feel like the label should instead be a boolean (or two) indicating whether the commit is in the conflictother() or conflictlocal() revsets. This might then look like this:

@  changeset:   5:f1d5f53e397b
|  tag:         tip
|  parent:      3:e28fd7fa7938
|  merging:     other
|  user:        shelve@localhost
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     changes to: add A to bars
|
| @  changeset:   4:fe451a778c81
|/   merging:     local
|    user:        test
|    date:        Thu Jan 01 00:00:00 1970 +0000
|    summary:     add C to bars

That may be a good way of helping the user understand what "local" and "other" in the conflict markers mean.

This revision now requires changes to proceed.Tue, Sep 21, 12:50 PM