Mercurial > evolve
comparison tests/test-topic-stack-complex.t @ 4082:185770c10a4e mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 03 Sep 2018 22:59:20 +0200 |
| parents | 9c025ec4af88 |
| children | e07e764c0f48 |
comparison
equal
deleted
inserted
replaced
| 4081:20dcc92c285f | 4082:185770c10a4e |
|---|---|
| 30 $ hg ci -Aqm "Added c and d" | 30 $ hg ci -Aqm "Added c and d" |
| 31 $ echo e > e | 31 $ echo e > e |
| 32 $ echo f > f | 32 $ echo f > f |
| 33 $ hg ci -Aqm "Added e and f" | 33 $ hg ci -Aqm "Added e and f" |
| 34 $ hg show work | 34 $ hg show work |
| 35 @ f1d3 (foo) Added e and f | 35 @ f1d36 (foo) Added e and f |
| 36 o 8e82 (foo) Added c and d | 36 o 8e825 (foo) Added c and d |
| 37 o 002b (foo) Added a and b | 37 o 002b8 (foo) Added a and b |
| 38 o f360 Added foo | 38 o f3603 Added foo |
| 39 | 39 |
| 40 Testing in case of split within the topic | 40 Testing in case of split within the topic |
| 41 | 41 |
| 42 $ hg stack | 42 $ hg stack |
| 43 ### topic: foo | 43 ### topic: foo |
| 90 s2: split1 | 90 s2: split1 |
| 91 s1: Added a and b | 91 s1: Added a and b |
| 92 s0^ Added foo (base) | 92 s0^ Added foo (base) |
| 93 | 93 |
| 94 $ hg show work | 94 $ hg show work |
| 95 @ 5cce (foo) split2 | 95 @ 5ccee (foo) split2 |
| 96 o f26c (foo) split1 | 96 o f26c1 (foo) split1 |
| 97 | o f1d3 (foo) Added e and f | 97 | o f1d36 (foo) Added e and f |
| 98 | x 8e82 (foo) Added c and d | 98 | x 8e825 (foo) Added c and d |
| 99 |/ | 99 |/ |
| 100 o 002b (foo) Added a and b | 100 o 002b8 (foo) Added a and b |
| 101 o f360 Added foo | 101 o f3603 Added foo |
| 102 | 102 |
| 103 $ hg prev | 103 $ hg prev |
| 104 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 104 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 105 [4] split1 | 105 [4] split1 |
| 106 $ echo foo > c | 106 $ echo foo > c |
| 111 @@ -1,1 +1,1 @@ | 111 @@ -1,1 +1,1 @@ |
| 112 -c | 112 -c |
| 113 +foo | 113 +foo |
| 114 | 114 |
| 115 $ hg amend | 115 $ hg amend |
| 116 1 new orphan changesets | 116 1 new unstable changesets |
| 117 $ hg show work | 117 $ hg show work |
| 118 @ 7d94 (foo) split1 | 118 @ 7d944 (foo) split1 |
| 119 | o 5cce (foo) split2 | 119 | o 5ccee (foo) split2 |
| 120 | x f26c (foo) split1 | 120 | x f26c1 (foo) split1 |
| 121 |/ | 121 |/ |
| 122 | o f1d3 (foo) Added e and f | 122 | o f1d36 (foo) Added e and f |
| 123 | x 8e82 (foo) Added c and d | 123 | x 8e825 (foo) Added c and d |
| 124 |/ | 124 |/ |
| 125 o 002b (foo) Added a and b | 125 o 002b8 (foo) Added a and b |
| 126 o f360 Added foo | 126 o f3603 Added foo |
| 127 | 127 |
| 128 $ hg stack | 128 $ hg stack |
| 129 ### topic: foo (2 heads) | 129 ### topic: foo (2 heads) |
| 130 ### target: default (branch), 2 behind | 130 ### target: default (branch), 2 behind |
| 131 s4$ Added e and f (unstable) | 131 s4$ Added e and f (unstable) |