tests/test-shelve.t

21525:559f01f19cf6

  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

21526:3b40e32e88c3

  diff --git a/a/a b/a/a
  --- a/a/a
  +++ b/a/a
  @@ -1,2 +1,6 @@
   a
  +<<<<<<< dest: *  - shelve: "pending changes temporary commit" (glob)
   c
  +=======
  +a
  +>>>>>>> source: * - 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
  <<<<<<< dest:   5f6b880e719b  - shelve: "pending changes temporary commit"
  g
  =======
  f
  >>>>>>> source: 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
  <<<<<<< dest:   6b563750f973  - test: "intermediate other change"
  g
  =======
  f
  >>>>>>> source: 23b29cada8ba - shelve: "changes to 'commit stuff'"
  $ cat f.orig
  g
  $ hg unshelve --abort
  rebase aborted
  no changes needed to a