diff -r 142827ad86f3 -r a73cdef2e33f tests/test-evolve-content-divergent-basic.t --- a/tests/test-evolve-content-divergent-basic.t Thu May 07 07:57:14 2020 -0700 +++ b/tests/test-evolve-content-divergent-basic.t Fri May 08 04:02:22 2020 +0200 @@ -142,9 +142,9 @@ with: [3] divergent base: [1] added b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at cfcd9a3d0588 + working directory is now at 98ab969ac8fb $ hg log -G - @ 4:cfcd9a3d0588@default(draft) divergent [] + @ 4:98ab969ac8fb@default(draft) divergent [] | o 0:9092f1db7931@default(draft) added a [] @@ -153,7 +153,7 @@ # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID cfcd9a3d0588dd3abd278373246f2bdd6a646647 + # Node ID 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 # Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318 divergent @@ -240,10 +240,10 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved content divergent changesets on different branches. choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c - working directory is now at f7d7ae0f2678 + working directory is now at 15ee7f765bf7 $ hg glog - @ 7:f7d7ae0f2678 added d + @ 7:15ee7f765bf7 added d | () [foobar] draft o 3:ca1b80f7960a added c | () [default] draft @@ -276,7 +276,7 @@ $ hg glog @ 9:59081c9c425a added a d with bar in it, expect some beers | () [default] draft - | * 8:41db48ee7fab added d + | * 8:e6f07f2f33a9 added d |/ () [foobar] draft o 3:ca1b80f7960a added c | () [default] draft @@ -292,10 +292,10 @@ with: [8] added d base: [7] added d 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 687b947d0a60 + working directory is now at 34e78e1673c1 $ hg glog - @ 10:687b947d0a60 added a d with bar in it, expect some beers + @ 10:34e78e1673c1 added a d with bar in it, expect some beers | () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -313,18 +313,18 @@ $ hg up 'predecessors(.)' --hidden 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 687b947d0a60 - (hidden revision '687b947d0a60' was rewritten as: 7b36e4bdcf1b) - working directory parent is obsolete! (687b947d0a60) - (use 'hg evolve' to update to its successor: 7b36e4bdcf1b) + updated to hidden changeset 34e78e1673c1 + (hidden revision '34e78e1673c1' was rewritten as: c9d0d72972b0) + working directory parent is obsolete! (34e78e1673c1) + (use 'hg evolve' to update to its successor: c9d0d72972b0) $ echo babar > d $ hg amend -m "foo to d" 2 new content-divergent changesets $ hg glog - @ 12:9de05413bc4d foo to d + @ 12:b4dadb3b47a7 foo to d | () [default] draft - | * 11:7b36e4bdcf1b foo to d + | * 11:c9d0d72972b0 foo to d |/ () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -351,10 +351,10 @@ (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue - working directory is now at 348265c659d9 + working directory is now at cfd599de811a $ hg glog - @ 13:348265c659d9 foo to d + @ 13:cfd599de811a foo to d | () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -373,18 +373,18 @@ $ hg up 'predecessors(.)' --hidden 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 348265c659d9 - (hidden revision '348265c659d9' was rewritten as: e0633eb64c66) - working directory parent is obsolete! (348265c659d9) - (use 'hg evolve' to update to its successor: e0633eb64c66) + updated to hidden changeset cfd599de811a + (hidden revision 'cfd599de811a' was rewritten as: ba0941ffb747) + working directory parent is obsolete! (cfd599de811a) + (use 'hg evolve' to update to its successor: ba0941ffb747) $ echo wat > d $ hg amend -m "wat to d, wat?" 2 new content-divergent changesets $ hg glog - @ 15:3eec13f9b72e wat to d, wat? + @ 15:4127dd63df67 wat to d, wat? | () [default] draft - | * 14:e0633eb64c66 bar to d, expect beers + | * 14:ba0941ffb747 bar to d, expect beers |/ () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -434,10 +434,10 @@ **done showing editors text** - working directory is now at 39483e49e3bb + working directory is now at b4c8664fa327 $ hg glog - @ 16:39483e49e3bb watbar to d + @ 16:b4c8664fa327 watbar to d | () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -533,15 +533,15 @@ a committing manifest committing changelog - working directory is now at b4deda8116ef + working directory is now at 6aa6f90a9f68 $ hg st $ glog - @ 4:b4deda8116ef@default(draft) bk:[] More addition + @ 4:6aa6f90a9f68@default(draft) bk:[] More addition | o 0:6569b5a81c7e@default(public) bk:[] root $ hg summary - parent: 4:b4deda8116ef tip + parent: 4:6aa6f90a9f68 tip More addition branch: default commit: (clean) @@ -552,7 +552,7 @@ # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID b4deda8116effeb6eeabd0a14f40cc8b21ca1b37 + # Node ID 6aa6f90a9f684b8a4b698234e25c5dad7328b199 # Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd More addition @@ -577,9 +577,9 @@ $ hg up --hidden 'min(desc("More addition"))' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to hidden changeset 867e43582046 - (hidden revision '867e43582046' was rewritten as: b4deda8116ef) + (hidden revision '867e43582046' was rewritten as: 6aa6f90a9f68) working directory parent is obsolete! (867e43582046) - (use 'hg evolve' to update to its successor: b4deda8116ef) + (use 'hg evolve' to update to its successor: 6aa6f90a9f68) $ echo 'gotta break' >> a $ hg amend 2 new content-divergent changesets @@ -594,15 +594,15 @@ $ glog @ 6:13c1b75640a1@default(draft) bk:[] More addition (2) | - | * 4:b4deda8116ef@default(draft) bk:[] More addition + | * 4:6aa6f90a9f68@default(draft) bk:[] More addition |/ o 0:6569b5a81c7e@default(public) bk:[] root $ hg evolve -qn --content-divergent --no-all hg update -c 13c1b75640a1 && - hg merge b4deda8116ef && - hg commit -m "auto merge resolving conflict between 13c1b75640a1 and b4deda8116ef"&& + hg merge 6aa6f90a9f68 && + hg commit -m "auto merge resolving conflict between 13c1b75640a1 and 6aa6f90a9f68"&& hg up -C 867e43582046 && hg revert --all --rev tip && hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`"; @@ -633,9 +633,9 @@ (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue - working directory is now at 4a175c20d152 + working directory is now at 22dc0f618f0d $ glog - @ 7:4a175c20d152@default(draft) bk:[] More addition (2) + @ 7:22dc0f618f0d@default(draft) bk:[] More addition (2) | o 0:6569b5a81c7e@default(public) bk:[] root @@ -644,7 +644,7 @@ # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID 4a175c20d152f8f4266a3b85a5dcf74b5a032719 + # Node ID 22dc0f618f0d8714c611e7a683ad229a575f167c # Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd More addition (2) @@ -964,7 +964,7 @@ merging numbers merging romans 1 files updated, 2 files merged, 0 files removed, 0 files unresolved - working directory is now at ce0aaa423a89 + working directory is now at e7cb08a7241a $ hg status $ hg amend -m 'E4' $ hg export @@ -972,7 +972,7 @@ # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID b8e4a5a633b6fb38bbc9011601b3342573733083 + # Node ID 50bb00cad3206c79d231a621e319772302a88d8d # Parent 6d1fdf6de7e2d9fc9b098aa286b60785bbeaab7a E4 @@ -995,22 +995,22 @@ -VI +vi $ hg log -G - @ 5:b8e4a5a633b6@default(draft) E4 [] + @ 5:50bb00cad320@default(draft) E4 [] | o 0:6d1fdf6de7e2@default(draft) root [] $ hg debugobsolete 4a250e5bd992a897655e3b6f238e12452cf063e9 084ae625fa51ca8c441ba1d2bf0f974b21671017 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} - 084ae625fa51ca8c441ba1d2bf0f974b21671017 ce0aaa423a89436c9a9b320283dc0cc89f04a91d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'} - 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d ce0aaa423a89436c9a9b320283dc0cc89f04a91d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'} - ce0aaa423a89436c9a9b320283dc0cc89f04a91d b8e4a5a633b6fb38bbc9011601b3342573733083 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} + 084ae625fa51ca8c441ba1d2bf0f974b21671017 e7cb08a7241a98c908db298b61fc033b27f648c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'} + 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d e7cb08a7241a98c908db298b61fc033b27f648c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'} + e7cb08a7241a98c908db298b61fc033b27f648c7 50bb00cad3206c79d231a621e319772302a88d8d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} $ hg obslog --patch - @ b8e4a5a633b6 (5) E4 + @ 50bb00cad320 (5) E4 | - x ce0aaa423a89 (4) <<<<<<< divergent - |\ reworded(description) as b8e4a5a633b6 using amend by test (Thu Jan 01 00:00:00 1970 +0000) - | | diff -r ce0aaa423a89 -r b8e4a5a633b6 changeset-description + x e7cb08a7241a (4) <<<<<<< divergent + |\ reworded(description) as 50bb00cad320 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + | | diff -r e7cb08a7241a -r 50bb00cad320 changeset-description | | --- a/changeset-description | | +++ b/changeset-description | | @@ -1,4 +1,1 @@ @@ -1022,8 +1022,8 @@ | | | | x | 084ae625fa51 (2) E2 - | | rewritten(description, content) as ce0aaa423a89 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) - | | diff -r 084ae625fa51 -r ce0aaa423a89 changeset-description + | | rewritten(description, content) as e7cb08a7241a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | | diff -r 084ae625fa51 -r e7cb08a7241a changeset-description | | --- a/changeset-description | | +++ b/changeset-description | | @@ -1,1 +1,4 @@ @@ -1054,8 +1054,8 @@ | | | | | x 19ed1bf64a2c (3) E3 - |/ rewritten(description, content) as ce0aaa423a89 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) - | diff -r 19ed1bf64a2c -r ce0aaa423a89 changeset-description + |/ rewritten(description, content) as e7cb08a7241a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) + | diff -r 19ed1bf64a2c -r e7cb08a7241a changeset-description | --- a/changeset-description | +++ b/changeset-description | @@ -1,1 +1,4 @@