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

[martinvonz (Martin von Zweigbergk)]

This revision now requires changes to proceed.
martinvonz added inline comments.
martinvonz requested changes to this revision.

INLINE COMMENTS

> test-shelve.t:1420-1432
>    @  changeset:   5:f1d5f53e397b
>    |  tag:         tip
>    |  parent:      3:e28fd7fa7938
>    |  user:        shelve at localhost
>    |  date:        Thu Jan 01 00:00:00 1970 +0000
>    |  summary:     changes to: add A to bars
>    |

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 at 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.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11453/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11453

To: joerg.sonnenberger, #hg-reviewers, martinvonz
Cc: martinvonz, Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210921/29d37b3f/attachment-0002.html>