Mercurial > evolve
comparison tests/test-unstable.t @ 3411:e1f3e43a50a4 stable
branching: backed out test output changes from core-1905aac253f0
This backs out evolve-ae6fddf39933
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 15 Jan 2018 19:52:00 +0100 |
| parents | ae6fddf39933 |
| children | 85cdce113c2c d3a17c67f85c |
comparison
equal
deleted
inserted
replaced
| 3410:39112fd4d5ed | 3411:e1f3e43a50a4 |
|---|---|
| 44 $ hg amend -m "bprime" | 44 $ hg amend -m "bprime" |
| 45 1 new orphan changesets | 45 1 new orphan changesets |
| 46 $ hg log -G | 46 $ hg log -G |
| 47 @ 3:36050226a9b9@default(draft) bprime | 47 @ 3:36050226a9b9@default(draft) bprime |
| 48 | | 48 | |
| 49 | * 2:102002290587@default(draft) add _c | 49 | o 2:102002290587@default(draft) add _c |
| 50 | | | 50 | | |
| 51 | x 1:37445b16603b@default(draft) add _b | 51 | x 1:37445b16603b@default(draft) add _b |
| 52 |/ | 52 |/ |
| 53 o 0:135f39f4bd78@default(draft) add _a | 53 o 0:135f39f4bd78@default(draft) add _a |
| 54 | 54 |
| 88 $ hg amend -m "aprime" | 88 $ hg amend -m "aprime" |
| 89 1 new orphan changesets | 89 1 new orphan changesets |
| 90 $ hg log -G | 90 $ hg log -G |
| 91 @ 4:47127ea62e5f@default(draft) aprime | 91 @ 4:47127ea62e5f@default(draft) aprime |
| 92 | | 92 | |
| 93 | * 3:6b4280e33286@default(draft) merge | 93 | o 3:6b4280e33286@default(draft) merge |
| 94 | |\ | 94 | |\ |
| 95 +---o 2:474da87dd33b@default(draft) add _c | 95 +---o 2:474da87dd33b@default(draft) add _c |
| 96 | | | 96 | | |
| 97 | x 1:b3264cec9506@default(draft) add _a | 97 | x 1:b3264cec9506@default(draft) add _a |
| 98 |/ | 98 |/ |
| 141 $ hg log -G | 141 $ hg log -G |
| 142 @ 5:2db39fda7e2f@default(draft) cprime | 142 @ 5:2db39fda7e2f@default(draft) cprime |
| 143 | | 143 | |
| 144 | o 4:47127ea62e5f@default(draft) aprime | 144 | o 4:47127ea62e5f@default(draft) aprime |
| 145 |/ | 145 |/ |
| 146 | * 3:6b4280e33286@default(draft) merge | 146 | o 3:6b4280e33286@default(draft) merge |
| 147 | |\ | 147 | |\ |
| 148 +---x 2:474da87dd33b@default(draft) add _c | 148 +---x 2:474da87dd33b@default(draft) add _c |
| 149 | | | 149 | | |
| 150 | x 1:b3264cec9506@default(draft) add _a | 150 | x 1:b3264cec9506@default(draft) add _a |
| 151 |/ | 151 |/ |
| 158 $ hg log -G | 158 $ hg log -G |
| 159 @ 5:2db39fda7e2f@default(draft) cprime | 159 @ 5:2db39fda7e2f@default(draft) cprime |
| 160 | | 160 | |
| 161 | o 4:47127ea62e5f@default(draft) aprime | 161 | o 4:47127ea62e5f@default(draft) aprime |
| 162 |/ | 162 |/ |
| 163 | * 3:6b4280e33286@default(draft) merge | 163 | o 3:6b4280e33286@default(draft) merge |
| 164 | |\ | 164 | |\ |
| 165 +---x 2:474da87dd33b@default(draft) add _c | 165 +---x 2:474da87dd33b@default(draft) add _c |
| 166 | | | 166 | | |
| 167 | x 1:b3264cec9506@default(draft) add _a | 167 | x 1:b3264cec9506@default(draft) add _a |
| 168 |/ | 168 |/ |
| 189 $ hg log -G | 189 $ hg log -G |
| 190 @ 4:2a4ccc0bb20c@default(draft) add bprimesplit2 | 190 @ 4:2a4ccc0bb20c@default(draft) add bprimesplit2 |
| 191 | | 191 | |
| 192 o 3:8b87864bd0f4@default(draft) add bprimesplit1 | 192 o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
| 193 | | 193 | |
| 194 | * 2:102002290587@default(draft) add _c | 194 | o 2:102002290587@default(draft) add _c |
| 195 | | | 195 | | |
| 196 | x 1:37445b16603b@default(draft) add _b | 196 | x 1:37445b16603b@default(draft) add _b |
| 197 |/ | 197 |/ |
| 198 o 0:135f39f4bd78@default(draft) add _a | 198 o 0:135f39f4bd78@default(draft) add _a |
| 199 | 199 |
| 243 $ hg log -G | 243 $ hg log -G |
| 244 @ 6:59b942dbda14@default(draft) add bsecondsplit2 | 244 @ 6:59b942dbda14@default(draft) add bsecondsplit2 |
| 245 | | 245 | |
| 246 o 5:8ffdae67d696@default(draft) add bsecondsplit1 | 246 o 5:8ffdae67d696@default(draft) add bsecondsplit1 |
| 247 | | 247 | |
| 248 | * 2:102002290587@default(draft) add _c | 248 | o 2:102002290587@default(draft) add _c |
| 249 | | | 249 | | |
| 250 | x 1:37445b16603b@default(draft) add _b | 250 | x 1:37445b16603b@default(draft) add _b |
| 251 |/ | 251 |/ |
| 252 o 0:135f39f4bd78@default(draft) add _a | 252 o 0:135f39f4bd78@default(draft) add _a |
| 253 | 253 |
| 292 $ hg log -G | 292 $ hg log -G |
| 293 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2 | 293 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2 |
| 294 | | 294 | |
| 295 | o 3:8b87864bd0f4@default(draft) add bprimesplit1 | 295 | o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
| 296 |/ | 296 |/ |
| 297 | * 2:102002290587@default(draft) add _c | 297 | o 2:102002290587@default(draft) add _c |
| 298 | | | 298 | | |
| 299 | x 1:37445b16603b@default(draft) add _b | 299 | x 1:37445b16603b@default(draft) add _b |
| 300 |/ | 300 |/ |
| 301 o 0:135f39f4bd78@default(draft) add _a | 301 o 0:135f39f4bd78@default(draft) add _a |
| 302 | 302 |
| 306 $ hg log -G | 306 $ hg log -G |
| 307 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2 | 307 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2 |
| 308 | | 308 | |
| 309 | o 3:8b87864bd0f4@default(draft) add bprimesplit1 | 309 | o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
| 310 |/ | 310 |/ |
| 311 | * 2:102002290587@default(draft) add _c | 311 | o 2:102002290587@default(draft) add _c |
| 312 | | | 312 | | |
| 313 | x 1:37445b16603b@default(draft) add _b | 313 | x 1:37445b16603b@default(draft) add _b |
| 314 |/ | 314 |/ |
| 315 o 0:135f39f4bd78@default(draft) add _a | 315 o 0:135f39f4bd78@default(draft) add _a |
| 316 | 316 |
| 317 | 317 |
| 318 | 318 |
| 319 $ cd .. | 319 $ cd .. |
| 320 | 320 |