Mercurial > evolve
comparison tests/test-stabilize-result.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 | 19ec729f3ca2 f7afd3a158e3 |
| children | 537fd9a86c06 f9a850018daa |
comparison
equal
deleted
inserted
replaced
| 3929:e709e3817d7e | 3930:d00f0c369bc7 |
|---|---|
| 235 o 0:07f494440405@default(public) bk:[] adda | 235 o 0:07f494440405@default(public) bk:[] adda |
| 236 | 236 |
| 237 $ echo 'babar' >> a | 237 $ echo 'babar' >> a |
| 238 $ hg amend | 238 $ hg amend |
| 239 $ hg up --hidden 3932c176bbaa | 239 $ hg up --hidden 3932c176bbaa |
| 240 updating to a hidden changeset 3932c176bbaa | |
| 241 (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686) | |
| 242 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 240 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 243 working directory parent is obsolete! (3932c176bbaa) | 241 working directory parent is obsolete! (3932c176bbaa) |
| 244 (use 'hg evolve' to update to its successor: d2f173e25686) | 242 (use 'hg evolve' to update to its successor: d2f173e25686) |
| 245 $ mv a a.old | 243 $ mv a a.old |
| 246 $ echo 'jungle' > a | 244 $ echo 'jungle' > a |
| 249 $ hg amend | 247 $ hg amend |
| 250 2 new content-divergent changesets | 248 2 new content-divergent changesets |
| 251 $ glog | 249 $ glog |
| 252 @ 14:eacc9c8240fe@default(draft) bk:[] More addition | 250 @ 14:eacc9c8240fe@default(draft) bk:[] More addition |
| 253 | | 251 | |
| 254 | * 13:d2f173e25686@default(draft) bk:[] More addition | 252 | o 13:d2f173e25686@default(draft) bk:[] More addition |
| 255 |/ | 253 |/ |
| 256 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | 254 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
| 257 | | | 255 | | |
| 258 o | 7:7bc2f5967f5e@default(draft) bk:[] add c | 256 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
| 259 | | | 257 | | |
| 343 | 341 |
| 344 Check conflict during divergence resolution | 342 Check conflict during divergence resolution |
| 345 ------------------------------------------------- | 343 ------------------------------------------------- |
| 346 | 344 |
| 347 $ hg up --hidden 3932c176bbaa | 345 $ hg up --hidden 3932c176bbaa |
| 348 updating to a hidden changeset 3932c176bbaa | |
| 349 (hidden revision '3932c176bbaa' was rewritten as: 4d6ed26797bc) | |
| 350 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 346 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 351 working directory parent is obsolete! (3932c176bbaa) | 347 working directory parent is obsolete! (3932c176bbaa) |
| 352 (use 'hg evolve' to update to its successor: 4d6ed26797bc) | 348 (use 'hg evolve' to update to its successor: 4d6ed26797bc) |
| 353 $ echo 'gotta break' >> a | 349 $ echo 'gotta break' >> a |
| 354 $ hg amend | 350 $ hg amend |
| 360 17: draft | 356 17: draft |
| 361 | 357 |
| 362 $ glog | 358 $ glog |
| 363 @ 17:0b336205a5d0@default(draft) bk:[] More addition (2) | 359 @ 17:0b336205a5d0@default(draft) bk:[] More addition (2) |
| 364 | | 360 | |
| 365 | * 15:4d6ed26797bc@default(draft) bk:[] More addition | 361 | o 15:4d6ed26797bc@default(draft) bk:[] More addition |
| 366 |/ | 362 |/ |
| 367 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | 363 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
| 368 | | | 364 | | |
| 369 o | 7:7bc2f5967f5e@default(draft) bk:[] add c | 365 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
| 370 | | | 366 | | |