Mercurial > evolve
changeset 6174:bd2c42680dff mercurial-6.0
test-compat: back out changeset 5e14782908e4
CORE-TEST-OUTPUT-UPDATE: f8f2ecdde4b5
CORE-TEST-OUTPUT-UPDATE: 053a5bf508da
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 07:03:00 +0300 |
| parents | 0a5ffb124443 |
| children | d03f682938ae |
| files | tests/test-amend.t tests/test-evolve-content-divergent-user-independent-resolution.t tests/test-evolve-obshistory.t tests/test-evolve-progress.t tests/test-evolve-templates.t tests/test-obsolete.t tests/test-sharing.t |
| diffstat | 7 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-amend.t Tue Feb 22 07:01:59 2022 +0300 +++ b/tests/test-amend.t Tue Feb 22 07:03:00 2022 +0300 @@ -218,7 +218,6 @@ $ echo edited_a > a $ hg ci -m "edited a" 1 new orphan changesets - created new head $ hg debugobsolete $(hg id -ir 0 --debug) $(hg id -ir 2 --debug) 1 new obsolescence markers 2 new content-divergent changesets
--- a/tests/test-evolve-content-divergent-user-independent-resolution.t Tue Feb 22 07:01:59 2022 +0300 +++ b/tests/test-evolve-content-divergent-user-independent-resolution.t Tue Feb 22 07:03:00 2022 +0300 @@ -35,7 +35,7 @@ $ hg push -q $ cd ../local - $ hg push --force -q + $ hg push -q 2 new content-divergent changesets $ hg pull -q 2 new content-divergent changesets
--- a/tests/test-evolve-obshistory.t Tue Feb 22 07:01:59 2022 +0300 +++ b/tests/test-evolve-obshistory.t Tue Feb 22 07:03:00 2022 +0300 @@ -151,7 +151,7 @@ 2 new obsolescence markers obsoleted 1 changesets new changesets 7a230b46bf61 (1 drafts) - (run 'hg heads' to see heads) + (run 'hg heads' to see heads, 'hg merge' to merge) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 7a230b46bf61) Check that obslog works with markers pointing to missing local changectx
--- a/tests/test-evolve-progress.t Tue Feb 22 07:01:59 2022 +0300 +++ b/tests/test-evolve-progress.t Tue Feb 22 07:03:00 2022 +0300 @@ -101,8 +101,6 @@ committing changelog updating the branch cache obscache is out of date - invalid branch cache (served): tip differs - invalid branch cache (served.hidden): tip differs resolving manifests branchmerge: False, force: False, partial: False ancestor: df5d742141b0, local: df5d742141b0+, remote: 152c368c622b @@ -177,7 +175,6 @@ updating the branch cache obscache is out of date invalid branch cache (served): tip differs - invalid branch cache (served.hidden): tip differs resolving manifests branchmerge: False, force: False, partial: False ancestor: c6e6fdb1d046, local: c6e6fdb1d046+, remote: f8d7d38c0a88
--- a/tests/test-evolve-templates.t Tue Feb 22 07:01:59 2022 +0300 +++ b/tests/test-evolve-templates.t Tue Feb 22 07:03:00 2022 +0300 @@ -1080,7 +1080,7 @@ 2 new obsolescence markers obsoleted 1 changesets new changesets 7a230b46bf61 (1 drafts) - (run 'hg heads' to see heads) + (run 'hg heads' to see heads, 'hg merge' to merge) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 7a230b46bf61) $ hg log --hidden -G
--- a/tests/test-obsolete.t Tue Feb 22 07:01:59 2022 +0300 +++ b/tests/test-obsolete.t Tue Feb 22 07:03:00 2022 +0300 @@ -134,7 +134,6 @@ (use 'hg evolve' to update to its successor: 725c380fe99b) $ mkcommit d # 5 (on 3) 1 new orphan changesets - created new head $ qlog -r 'obsolete()' 3 - 0d3f46688ccc
--- a/tests/test-sharing.t Tue Feb 22 07:01:59 2022 +0300 +++ b/tests/test-sharing.t Tue Feb 22 07:03:00 2022 +0300 @@ -104,6 +104,8 @@ obsoleted 1 changesets new changesets 522d503432a2 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to "522d503432a2: fix bug 37" + 1 other heads for branch "default" Figure SG03 $ hg -R ../dev-repo shortlog --hidden -G @@ -136,6 +138,8 @@ $ cd ../test-repo $ hg update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to "7b49f864d655: fix bug 37" + 1 other heads for branch "default" $ hg shortlog --hidden -G @ 4:7b49 draft fix bug 37 |