comparison tests/test-uncommit.t @ 4363:a2fdbece7ce1 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4

4362:8bd60e09dfb4

  5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}

Test phase is preserved, no local changes

  $ hg up -C 3 --hidden
  updating to a hidden changeset 5eb72dbe0cb4
  (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6)
  8 files updated, 0 files merged, 1 files removed, 0 files unresolved
  (leaving bookmark touncommit-bm)
  working directory parent is obsolete! (5eb72dbe0cb4)
  (use 'hg evolve' to update to its successor: e8db4aa611f6)
  $ hg --config extensions.purge= purge
  $ hg uncommit -I 'set:added() and e'
  2 new content-divergent changesets
  $ hg st --copies
  A e
  $ hg st --copies --change .
  M b
  M d

  R m
  R n
  $ glog --hidden
  @  5:a1d4c1ad76cc@bar(draft) touncommit
  |
  | *  4:e8db4aa611f6@bar(draft) touncommit
  |/
  | x  3:5eb72dbe0cb4@bar(obsolete/draft) touncommit
  |/
  o    2:f63b90038565@default(draft) merge
  |\

  5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}

Test --all

  $ hg up -C 3 --hidden
  updating to a hidden changeset 5eb72dbe0cb4
  (hidden revision '5eb72dbe0cb4' has diverged)
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  working directory parent is obsolete! (5eb72dbe0cb4)
  (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
  $ hg --config extensions.purge= purge
  $ hg uncommit --all -X e
  1 new content-divergent changesets
  $ hg st --copies
  M b
  M d
  M j
  M o

  $ hg ci -Am addunrelated unrelated
  $ hg previous
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  [8] touncommit
  $ hg uncommit aa
  1 new orphan changesets

Test uncommiting agains a different base

  $ hg cat b --rev .
  b

4363:a2fdbece7ce1

  5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}

Test phase is preserved, no local changes

  $ hg up -C 3 --hidden
  8 files updated, 0 files merged, 1 files removed, 0 files unresolved
  (leaving bookmark touncommit-bm)
  working directory parent is obsolete! (5eb72dbe0cb4)
  (use 'hg evolve' to update to its successor: e8db4aa611f6)
  $ hg --config extensions.purge= purge
  $ hg uncommit -I 'set:added() and e'
  $ hg st --copies
  A e
  $ hg st --copies --change .
  M b
  M d

  R m
  R n
  $ glog --hidden
  @  5:a1d4c1ad76cc@bar(draft) touncommit
  |
  | o  4:e8db4aa611f6@bar(draft) touncommit
  |/
  | x  3:5eb72dbe0cb4@bar(obsolete/draft) touncommit
  |/
  o    2:f63b90038565@default(draft) merge
  |\

  5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}

Test --all

  $ hg up -C 3 --hidden
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  working directory parent is obsolete! (5eb72dbe0cb4)
  (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
  $ hg --config extensions.purge= purge
  $ hg uncommit --all -X e
  $ hg st --copies
  M b
  M d
  M j
  M o

  $ hg ci -Am addunrelated unrelated
  $ hg previous
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  [8] touncommit
  $ hg uncommit aa

Test uncommiting agains a different base

  $ hg cat b --rev .
  b