Mercurial > evolve
comparison tests/test-touch.t @ 4173:e268f7fd7839 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 12 Oct 2018 15:15:09 +0200 |
| parents | d00f0c369bc7 |
| children | 537fd9a86c06 a2fdbece7ce1 |
comparison
equal
deleted
inserted
replaced
| 4172:35c21ab64420 | 4173:e268f7fd7839 |
|---|---|
| 30 | 30 |
| 31 $ echo A > b | 31 $ echo A > b |
| 32 $ hg add b | 32 $ hg add b |
| 33 $ hg commit -m ab --amend | 33 $ hg commit -m ab --amend |
| 34 $ hg up --hidden 1 | 34 $ hg up --hidden 1 |
| 35 updating to a hidden changeset [0-9a-f]{12} (re) | |
| 36 (hidden revision '*' was rewritten as: *) (glob) | |
| 37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 38 working directory parent is obsolete! (*) (glob) | 36 working directory parent is obsolete! (*) (glob) |
| 39 (use 'hg evolve' to update to its successor: *) (glob) | 37 (use 'hg evolve' to update to its successor: *) (glob) |
| 40 $ hg log -G | 38 $ hg log -G |
| 41 o 2:[0-9a-f]{12} ab (re) | 39 o 2:[0-9a-f]{12} ab (re) |
| 48 (a)llow divergence or (d)uplicate the changeset? a | 46 (a)llow divergence or (d)uplicate the changeset? a |
| 49 2 new content-divergent changesets | 47 2 new content-divergent changesets |
| 50 $ hg log -G | 48 $ hg log -G |
| 51 @ 3:[0-9a-f]{12} a (re) | 49 @ 3:[0-9a-f]{12} a (re) |
| 52 | 50 |
| 53 \* 2:[0-9a-f]{12} ab (re) | 51 o 2:[0-9a-f]{12} ab (re) |
| 54 | 52 |
| 55 $ hg prune 3 | 53 $ hg prune 3 |
| 56 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 54 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 57 working directory now at 000000000000 | 55 working directory now at 000000000000 |
| 58 1 changesets pruned | 56 1 changesets pruned |
| 112 1 new orphan changesets | 110 1 new orphan changesets |
| 113 | 111 |
| 114 $ hg log -G --hidden | 112 $ hg log -G --hidden |
| 115 @ 11:[0-9a-f]{12} gna1 (re) | 113 @ 11:[0-9a-f]{12} gna1 (re) |
| 116 | | 114 | |
| 117 . \* 10:[0-9a-f]{12} move (re) | 115 . o 10:[0-9a-f]{12} move (re) |
| 118 | | | 116 | | |
| 119 . x 9:[0-9a-f]{12} gna1 (re) | 117 . x 9:[0-9a-f]{12} gna1 (re) |
| 120 |/ | 118 |/ |
| 121 o 8:[0-9a-f]{12} d (re) | 119 o 8:[0-9a-f]{12} d (re) |
| 122 | | 120 | |