Mercurial > evolve
comparison tests/test-evolve-obshistory-phase-divergent.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | f3713d41b85b |
| children | 537fd9a86c06 a2fdbece7ce1 |
comparison
equal
deleted
inserted
replaced
| 3929:e709e3817d7e | 3930:d00f0c369bc7 |
|---|---|
| 35 user: test | 35 user: test |
| 36 date: Thu Jan 01 00:00:00 1970 +0000 | 36 date: Thu Jan 01 00:00:00 1970 +0000 |
| 37 summary: ROOT | 37 summary: ROOT |
| 38 | 38 |
| 39 $ hg update --hidden 'desc(A0)' | 39 $ hg update --hidden 'desc(A0)' |
| 40 updating to a hidden changeset 471f378eab4c | |
| 41 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) | |
| 42 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 40 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 43 working directory parent is obsolete! (471f378eab4c) | 41 working directory parent is obsolete! (471f378eab4c) |
| 44 (use 'hg evolve' to update to its successor: fdf9bde5129a) | 42 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
| 45 $ hg phase -p . | 43 $ hg phase -p . |
| 46 1 new phase-divergent changesets | 44 1 new phase-divergent changesets |
| 47 $ hg log --hidden -G | 45 $ hg log --hidden -G |
| 48 * changeset: 2:fdf9bde5129a | 46 o changeset: 2:fdf9bde5129a |
| 49 | tag: tip | 47 | tag: tip |
| 50 | parent: 0:ea207398892e | 48 | parent: 0:ea207398892e |
| 51 | user: test | 49 | user: test |
| 52 | date: Thu Jan 01 00:00:00 1970 +0000 | 50 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 53 | instability: phase-divergent | 51 | instability: phase-divergent |
| 79 | 77 |
| 80 | 78 |
| 81 | 79 |
| 82 Check that with all option, every changeset is shown | 80 Check that with all option, every changeset is shown |
| 83 $ hg obslog --hidden --all 471f378eab4c --patch | 81 $ hg obslog --hidden --all 471f378eab4c --patch |
| 84 * fdf9bde5129a (2) A1 | 82 o fdf9bde5129a (2) A1 |
| 85 | | 83 | |
| 86 @ 471f378eab4c (1) A0 | 84 @ 471f378eab4c (1) A0 |
| 87 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 85 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 88 diff -r 471f378eab4c -r fdf9bde5129a changeset-description | 86 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
| 89 --- a/changeset-description | 87 --- a/changeset-description |
| 119 } | 117 } |
| 120 ] | 118 ] |
| 121 Check that debugobshistory on the first diverged revision show the revision | 119 Check that debugobshistory on the first diverged revision show the revision |
| 122 and the diverent one | 120 and the diverent one |
| 123 $ hg obslog fdf9bde5129a --patch | 121 $ hg obslog fdf9bde5129a --patch |
| 124 * fdf9bde5129a (2) A1 | 122 o fdf9bde5129a (2) A1 |
| 125 | | 123 | |
| 126 @ 471f378eab4c (1) A0 | 124 @ 471f378eab4c (1) A0 |
| 127 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 125 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 128 diff -r 471f378eab4c -r fdf9bde5129a changeset-description | 126 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
| 129 --- a/changeset-description | 127 --- a/changeset-description |
| 134 | 132 |
| 135 | 133 |
| 136 | 134 |
| 137 Check that all option show all of them | 135 Check that all option show all of them |
| 138 $ hg obslog fdf9bde5129a -a --patch | 136 $ hg obslog fdf9bde5129a -a --patch |
| 139 * fdf9bde5129a (2) A1 | 137 o fdf9bde5129a (2) A1 |
| 140 | | 138 | |
| 141 @ 471f378eab4c (1) A0 | 139 @ 471f378eab4c (1) A0 |
| 142 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 140 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 143 diff -r 471f378eab4c -r fdf9bde5129a changeset-description | 141 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
| 144 --- a/changeset-description | 142 --- a/changeset-description |
| 149 | 147 |
| 150 | 148 |
| 151 Check that debugobshistory on the second diverged revision show the revision | 149 Check that debugobshistory on the second diverged revision show the revision |
| 152 and the diverent one | 150 and the diverent one |
| 153 $ hg obslog fdf9bde5129a --patch | 151 $ hg obslog fdf9bde5129a --patch |
| 154 * fdf9bde5129a (2) A1 | 152 o fdf9bde5129a (2) A1 |
| 155 | | 153 | |
| 156 @ 471f378eab4c (1) A0 | 154 @ 471f378eab4c (1) A0 |
| 157 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 155 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 158 diff -r 471f378eab4c -r fdf9bde5129a changeset-description | 156 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
| 159 --- a/changeset-description | 157 --- a/changeset-description |
| 163 +A1 | 161 +A1 |
| 164 | 162 |
| 165 | 163 |
| 166 Check that all option show all of them | 164 Check that all option show all of them |
| 167 $ hg obslog fdf9bde5129a -a --patch | 165 $ hg obslog fdf9bde5129a -a --patch |
| 168 * fdf9bde5129a (2) A1 | 166 o fdf9bde5129a (2) A1 |
| 169 | | 167 | |
| 170 @ 471f378eab4c (1) A0 | 168 @ 471f378eab4c (1) A0 |
| 171 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 169 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 172 diff -r 471f378eab4c -r fdf9bde5129a changeset-description | 170 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
| 173 --- a/changeset-description | 171 --- a/changeset-description |
| 178 | 176 |
| 179 | 177 |
| 180 Check that debugobshistory on the both diverged revision show a coherent | 178 Check that debugobshistory on the both diverged revision show a coherent |
| 181 graph | 179 graph |
| 182 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch | 180 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch |
| 183 * fdf9bde5129a (2) A1 | 181 o fdf9bde5129a (2) A1 |
| 184 | | 182 | |
| 185 @ 471f378eab4c (1) A0 | 183 @ 471f378eab4c (1) A0 |
| 186 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 184 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 187 diff -r 471f378eab4c -r fdf9bde5129a changeset-description | 185 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
| 188 --- a/changeset-description | 186 --- a/changeset-description |