Mercurial > evolve

changeset 2710:e22de367fc74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: adapt to change in 53b3a1968aa6-core
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 07 Jul 2017 00:42:18 +0200
parents 5d54de9cf50f
children 8c938e9af113
files tests/test-evolve-obshistory.t tests/test-evolve-serveronly-bundle2.t tests/test-evolve-templates.t tests/test-exchange-obsmarkers-case-A3.t tests/test-exchange-obsmarkers-case-A6.t tests/test-inhibit.t tests/test-obsolete.t tests/test-push-checkheads-pruned-B1.t tests/test-push-checkheads-pruned-B2.t tests/test-push-checkheads-pruned-B3.t tests/test-push-checkheads-pruned-B4.t tests/test-push-checkheads-pruned-B5.t tests/test-push-checkheads-pruned-B6.t tests/test-push-checkheads-pruned-B7.t tests/test-push-checkheads-pruned-B8.t tests/test-push-checkheads-superceed-A1.t tests/test-push-checkheads-superceed-A2.t tests/test-push-checkheads-superceed-A3.t tests/test-push-checkheads-superceed-A4.t tests/test-push-checkheads-superceed-A5.t tests/test-push-checkheads-superceed-A6.t tests/test-push-checkheads-superceed-A7.t tests/test-push-checkheads-superceed-A8.t tests/test-push-checkheads-unpushed-D4.t tests/test-push-checkheads-unpushed-D5.t tests/test-push-checkheads-unpushed-D7.t tests/test-sharing.t tests/test-tutorial.t tests/test-wireproto-bundle1.t tests/test-wireproto.t
diffstat 30 files changed, 47 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Fri Jul 07 00:42:18 2017 +0200
@@ -1603,6 +1603,7 @@
   adding file changes
   added 1 changesets with 0 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 1 changesets
   (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)
--- a/tests/test-evolve-serveronly-bundle2.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-evolve-serveronly-bundle2.t	Fri Jul 07 00:42:18 2017 +0200
@@ -108,6 +108,7 @@
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: 2 new obsolescence markers
+  remote: obsoleted 1 changesets
   $ cat ../errors.log
   $ hg push
   pushing to http://localhost:$HGPORT/
@@ -127,6 +128,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   2 new obsolescence markers
+  obsoleted 1 changesets
   (run 'hg heads' to see heads)
   $ cat ../errors.log
   $ hg -R ../other pull
--- a/tests/test-evolve-templates.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-evolve-templates.t	Fri Jul 07 00:42:18 2017 +0200
@@ -1033,6 +1033,7 @@
   adding file changes
   added 1 changesets with 0 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 1 changesets
   (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)
--- a/tests/test-exchange-obsmarkers-case-A3.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Fri Jul 07 00:42:18 2017 +0200
@@ -242,6 +242,7 @@
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: 1 new obsolescence markers
+  remote: obsoleted 1 changesets
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -257,6 +258,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
+  obsoleted 1 changesets
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
   ## post pull state
--- a/tests/test-exchange-obsmarkers-case-A6.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A6.t	Fri Jul 07 00:42:18 2017 +0200
@@ -108,6 +108,7 @@
   searching for changes
   no changes found
   remote: 1 new obsolescence markers
+  remote: obsoleted 1 changesets
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -118,6 +119,7 @@
   pulling from main
   no changes found
   1 new obsolescence markers
+  obsoleted 1 changesets
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -141,6 +143,7 @@
   searching for changes
   no changes found
   remote: 1 new obsolescence markers
+  remote: obsoleted 1 changesets
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -152,6 +155,7 @@
   searching for changes
   no changes found
   1 new obsolescence markers
+  obsoleted 1 changesets
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-inhibit.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-inhibit.t	Fri Jul 07 00:42:18 2017 +0200
@@ -687,6 +687,7 @@
   adding file changes
   added 2 changesets with 1 changes to 2 files (+1 heads)
   3 new obsolescence markers
+  obsoleted 1 changesets
   (run 'hg heads .' to see heads, 'hg merge' to merge)
 
  Only allow direct access and check that evolve works like before
--- a/tests/test-obsolete.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-obsolete.t	Fri Jul 07 00:42:18 2017 +0200
@@ -238,6 +238,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
+  obsoleted 1 changesets
   $ qlog -R ../other-new
   5
   - 95de7fc6918d
@@ -275,6 +276,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
+  obsoleted 1 changesets
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
@@ -365,6 +367,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
+  obsoleted 1 changesets
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg up -q 7 # to check rollback update behavior
@@ -541,6 +544,7 @@
   adding file changes
   added 2 changesets with 1 changes to [12] files (re)
   3 new obsolescence markers
+  obsoleted 1 changesets
   $ hg up -q 10
   $ mkcommit "obsol_d'''"
   created new head
@@ -553,6 +557,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
+  obsoleted 1 changesets
   $ cd ..
 
 check bumped detection
--- a/tests/test-push-checkheads-pruned-B1.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B1.t	Fri Jul 07 00:42:18 2017 +0200
@@ -68,5 +68,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
+  obsoleted 1 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-pruned-B2.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B2.t	Fri Jul 07 00:42:18 2017 +0200
@@ -81,5 +81,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 2 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-pruned-B3.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B3.t	Fri Jul 07 00:42:18 2017 +0200
@@ -81,6 +81,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 2 changesets
 
   $ cd ../..
 
--- a/tests/test-push-checkheads-pruned-B4.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B4.t	Fri Jul 07 00:42:18 2017 +0200
@@ -82,5 +82,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 2 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-pruned-B5.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B5.t	Fri Jul 07 00:42:18 2017 +0200
@@ -88,5 +88,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   3 new obsolescence markers
+  obsoleted 3 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-pruned-B6.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B6.t	Fri Jul 07 00:42:18 2017 +0200
@@ -74,5 +74,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 1 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-pruned-B7.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B7.t	Fri Jul 07 00:42:18 2017 +0200
@@ -73,5 +73,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 1 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-pruned-B8.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B8.t	Fri Jul 07 00:42:18 2017 +0200
@@ -94,5 +94,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   4 new obsolescence markers
+  obsoleted 2 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-superceed-A1.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A1.t	Fri Jul 07 00:42:18 2017 +0200
@@ -65,5 +65,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
+  obsoleted 1 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-superceed-A2.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A2.t	Fri Jul 07 00:42:18 2017 +0200
@@ -83,5 +83,6 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 2 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-superceed-A3.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A3.t	Fri Jul 07 00:42:18 2017 +0200
@@ -86,5 +86,6 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 2 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-superceed-A4.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A4.t	Fri Jul 07 00:42:18 2017 +0200
@@ -70,5 +70,6 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   1 new obsolescence markers
+  obsoleted 1 changesets
 
   $ cd ../../
--- a/tests/test-push-checkheads-superceed-A5.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A5.t	Fri Jul 07 00:42:18 2017 +0200
@@ -70,6 +70,7 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   1 new obsolescence markers
+  obsoleted 1 changesets
 
   $ cd ../..
 
--- a/tests/test-push-checkheads-superceed-A6.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A6.t	Fri Jul 07 00:42:18 2017 +0200
@@ -94,5 +94,6 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 2 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-superceed-A7.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A7.t	Fri Jul 07 00:42:18 2017 +0200
@@ -94,5 +94,6 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 2 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-superceed-A8.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A8.t	Fri Jul 07 00:42:18 2017 +0200
@@ -75,5 +75,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 1 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D4.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D4.t	Fri Jul 07 00:42:18 2017 +0200
@@ -118,5 +118,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
+  obsoleted 1 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D5.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D5.t	Fri Jul 07 00:42:18 2017 +0200
@@ -103,5 +103,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
+  obsoleted 1 changesets
 
   $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D7.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D7.t	Fri Jul 07 00:42:18 2017 +0200
@@ -92,5 +92,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   3 new obsolescence markers
+  obsoleted 1 changesets
 
   $ cd ../..
--- a/tests/test-sharing.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-sharing.t	Fri Jul 07 00:42:18 2017 +0200
@@ -88,6 +88,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 1 changesets
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to "60ffde5765c5: fix bug 37"
   1 other heads for branch "default"
@@ -211,6 +212,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 1 changesets
   updating bookmark bug15
   $ hg -R ../review bookmarks
      bug15                     3:cbdfbd5a5db2
@@ -255,6 +257,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 1 changesets
   updating bookmark featureX
 
 Bob receives second review, amends, and pushes to public:
@@ -280,6 +283,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
+  obsoleted 1 changesets
   updating bookmark featureX
   $ hg -R ../review bookmarks
      bug15                     3:cbdfbd5a5db2
@@ -395,6 +399,7 @@
   adding file changes
   added 1 changesets with 0 changes to 1 files
   1 new obsolescence markers
+  obsoleted 1 changesets
   updating bookmark bug15
 
 Figure SG08: review and public changesets after Alice pushes.
--- a/tests/test-tutorial.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-tutorial.t	Fri Jul 07 00:42:18 2017 +0200
@@ -733,6 +733,7 @@
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
   3 new obsolescence markers
+  obsoleted 2 changesets
 
 remote get a warning that current working directory is based on an obsolete changeset
 
--- a/tests/test-wireproto-bundle1.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-wireproto-bundle1.t	Fri Jul 07 00:42:18 2017 +0200
@@ -70,6 +70,7 @@
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: 2 new obsolescence markers
+  remote: obsoleted 1 changesets
   $ hg push
   pushing to ssh://user@dummy/server
   searching for changes
@@ -87,6 +88,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   2 new obsolescence markers
+  obsoleted 1 changesets
   (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
--- a/tests/test-wireproto.t	Sun Jul 02 19:43:44 2017 +0200
+++ b/tests/test-wireproto.t	Fri Jul 07 00:42:18 2017 +0200
@@ -74,6 +74,7 @@
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: obsmarker-exchange: 151 bytes received
   remote: 2 new obsolescence markers
+  remote: obsoleted 1 changesets
   $ hg push
   pushing to ssh://user@dummy/server
   searching for changes
@@ -92,6 +93,7 @@
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   obsmarker-exchange: 151 bytes received
   2 new obsolescence markers
+  obsoleted 1 changesets
   (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
@@ -138,6 +140,7 @@
   remote: added 1 changesets with 0 changes to 1 files (+1 heads)
   remote: obsmarker-exchange: 226 bytes received
   remote: 1 new obsolescence markers
+  remote: obsoleted 1 changesets
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
   searching for changes
@@ -147,6 +150,7 @@
   added 1 changesets with 0 changes to 1 files (+1 heads)
   obsmarker-exchange: 226 bytes received
   1 new obsolescence markers
+  obsoleted 1 changesets
   (run 'hg heads' to see heads)
 
 test discovery avoid exchanging known markers