comparison tests/test-shelve.t @ 21519:25d5a9ecbb85

merge: add conflict marker formatter (BC)

Adds a conflict marker formatter that can produce custom conflict marker
descriptions. It can be set via ui.mergemarkertemplate. The old behavior
can be used still by setting ui.mergemarkers=basic.

The default format is similar to:

  {node|short} {tag} {branch} {bookmarks} - {author}: "{desc|firstline}"

And renders as:

  contextblahblah
  <<<<<<< local: c7fdd7ce4652 - durham: "Fix broken stuff in my feature branch"
  line from my changes
  =======
  line from the other changes
  >>>>>>> other: a3e55d7f4d38  master - sid0: "This is a commit to master th...
  morecontextblahblah

21518:8e8049b9bda4

  diff --git a/a/a b/a/a
  --- a/a/a
  +++ b/a/a
  @@ -1,2 +1,6 @@
   a
  +<<<<<<< local
   c
  +=======
  +a
  +>>>>>>> other
  diff --git a/b.rename/b b/b.rename/b
  new file mode 100644
  --- /dev/null
  +++ b/b.rename/b
  @@ -0,0 +1,1 @@

  
  $ hg st
  M f
  ? f.orig
  $ cat f
  <<<<<<< local
  g
  =======
  f
  >>>>>>> other
  $ cat f.orig
  g
  $ hg unshelve --abort
  rebase aborted
  unshelve of 'default' aborted

  [1]
  $ hg st
  M f
  ? f.orig
  $ cat f
  <<<<<<< local
  g
  =======
  f
  >>>>>>> other
  $ cat f.orig
  g
  $ hg unshelve --abort
  rebase aborted
  no changes needed to a

21519:25d5a9ecbb85

  diff --git a/a/a b/a/a
  --- a/a/a
  +++ b/a/a
  @@ -1,2 +1,6 @@
   a
  +<<<<<<< local: *  - shelve: "pending changes temporary commit" (glob)
   c
  +=======
  +a
  +>>>>>>> other: * - shelve: "changes to '[mq]: second.patch'" (glob)
  diff --git a/b.rename/b b/b.rename/b
  new file mode 100644
  --- /dev/null
  +++ b/b.rename/b
  @@ -0,0 +1,1 @@

  
  $ hg st
  M f
  ? f.orig
  $ cat f
  <<<<<<< local: 5f6b880e719b  - shelve: "pending changes temporary commit"
  g
  =======
  f
  >>>>>>> other: 23b29cada8ba - shelve: "changes to 'commit stuff'"
  $ cat f.orig
  g
  $ hg unshelve --abort
  rebase aborted
  unshelve of 'default' aborted

  [1]
  $ hg st
  M f
  ? f.orig
  $ cat f
  <<<<<<< local: 6b563750f973  - test: "intermediate other change"
  g
  =======
  f
  >>>>>>> other: 23b29cada8ba - shelve: "changes to 'commit stuff'"
  $ cat f.orig
  g
  $ hg unshelve --abort
  rebase aborted
  no changes needed to a