Mercurial > evolve
comparison tests/test-evolve-obshistory.t @ 2835:20c2499ce8bc
log: divergent was renamed into contentdivergent
Divergent was renamed into contentdivergent, update tests.
Match 2194a8723138 mercurial changeset.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 10 Aug 2017 17:57:50 +0200 |
| parents | 08a64770ed24 |
| children | f6517779a7c4 |
comparison
equal
deleted
inserted
replaced
| 2834:38db1466c6fb | 2835:20c2499ce8bc |
|---|---|
| 994 @ changeset: 3:65b757b745b9 | 994 @ changeset: 3:65b757b745b9 |
| 995 | tag: tip | 995 | tag: tip |
| 996 | parent: 0:ea207398892e | 996 | parent: 0:ea207398892e |
| 997 | user: test | 997 | user: test |
| 998 | date: Thu Jan 01 00:00:00 1970 +0000 | 998 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 999 | instability: divergent | 999 | instability: content-divergent |
| 1000 | summary: A2 | 1000 | summary: A2 |
| 1001 | | 1001 | |
| 1002 | o changeset: 2:fdf9bde5129a | 1002 | o changeset: 2:fdf9bde5129a |
| 1003 |/ parent: 0:ea207398892e | 1003 |/ parent: 0:ea207398892e |
| 1004 | user: test | 1004 | user: test |
| 1005 | date: Thu Jan 01 00:00:00 1970 +0000 | 1005 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1006 | instability: divergent | 1006 | instability: content-divergent |
| 1007 | summary: A1 | 1007 | summary: A1 |
| 1008 | | 1008 | |
| 1009 | x changeset: 1:471f378eab4c | 1009 | x changeset: 1:471f378eab4c |
| 1010 |/ user: test | 1010 |/ user: test |
| 1011 | date: Thu Jan 01 00:00:00 1970 +0000 | 1011 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1265 (use --hidden to access hidden revisions; diverged) | 1265 (use --hidden to access hidden revisions; diverged) |
| 1266 [255] | 1266 [255] |
| 1267 $ hg update --hidden 'desc(A0)' | 1267 $ hg update --hidden 'desc(A0)' |
| 1268 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1268 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1269 working directory parent is obsolete! (471f378eab4c) | 1269 working directory parent is obsolete! (471f378eab4c) |
| 1270 (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue) | 1270 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
| 1271 | 1271 |
| 1272 Test output with amended + folded commit | 1272 Test output with amended + folded commit |
| 1273 ======================================== | 1273 ======================================== |
| 1274 | 1274 |
| 1275 Test setup | 1275 Test setup |