# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1435276527 25200
# Node ID 5f6e78aea09441c49971819b40fc17d8f4bbb960
# Parent  3295353b13633527d362760d3209c4fd535a988a# Parent  9be1cadf7a07a0ee35b908dfc16e560673bf2ade
merge with stable

Test are updated to run with current mercurial stable (3.4.1)

diff -r 9be1cadf7a07 -r 5f6e78aea094 tests/test-amend.t
--- a/tests/test-amend.t	Wed Jun 24 20:06:45 2015 -0700
+++ b/tests/test-amend.t	Thu Jun 25 16:55:27 2015 -0700
@@ -115,7 +115,6 @@
   branch: foo
   commit: 1 unknown (clean)
   update: (current)
-  phases: 3 draft
 
 Check the help
   $ hg amend -h
diff -r 9be1cadf7a07 -r 5f6e78aea094 tests/test-corrupt.t
--- a/tests/test-corrupt.t	Wed Jun 24 20:06:45 2015 -0700
+++ b/tests/test-corrupt.t	Thu Jun 25 16:55:27 2015 -0700
@@ -110,7 +110,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
-  2 new obsolescence markers
+  pushing 2 obsolescence markers (160 bytes)
+  2 obsolescence markers added
   $ hg -R ../other verify
   checking changesets
   checking manifests
diff -r 9be1cadf7a07 -r 5f6e78aea094 tests/test-evolve-bumped.t
--- a/tests/test-evolve-bumped.t	Wed Jun 24 20:06:45 2015 -0700
+++ b/tests/test-evolve-bumped.t	Thu Jun 25 16:55:27 2015 -0700
@@ -49,6 +49,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pull obsolescence markers
   (run 'hg update' to get a working copy)
   $ hg log -r 'draft()'
   1:4d1169d82e47@default(draft) modify a
@@ -67,6 +68,7 @@
   pulling from ../public
   searching for changes
   no changes found
+  pull obsolescence markers
   1 new bumped changesets
 
   $ hg evolve -a -A --bumped
diff -r 9be1cadf7a07 -r 5f6e78aea094 tests/test-evolve.t
--- a/tests/test-evolve.t	Wed Jun 24 20:06:45 2015 -0700
+++ b/tests/test-evolve.t	Thu Jun 25 16:55:27 2015 -0700
@@ -474,6 +474,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pull obsolescence markers
   $ cd alpha
 
   $ cat << EOF > A
@@ -530,7 +531,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  2 new obsolescence markers
+  pull obsolescence markers
+  2 obsolescence markers added
   (run 'hg update' to get a working copy)
   $ hg up
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r 9be1cadf7a07 -r 5f6e78aea094 tests/test-inhibit.t
--- a/tests/test-inhibit.t	Wed Jun 24 20:06:45 2015 -0700
+++ b/tests/test-inhibit.t	Thu Jun 25 16:55:27 2015 -0700
@@ -133,7 +133,6 @@
   branch: default
   commit: (clean)
   update: 1 new changesets, 2 branch heads (merge)
-  phases: 6 draft
 
 check public revision got cleared
 (when adding the second inhibitor, the first one is removed because it is public)
@@ -353,8 +352,7 @@
   +cD
 
   $ hg export 1 3
-  abort: hidden revision '1'!
-  (use --hidden to access hidden revisions)
+  abort: filtered revision '1' (not in 'visible-directaccess-nowarn' subset)!
   [255]
 
 
@@ -399,8 +397,7 @@
   o  0:54ccbc537fc2 add cA
   
   $ hg rebase -s 10 -d 3 
-  abort: hidden revision '3'!
-  (use --hidden to access hidden revisions)
+  abort: filtered revision '3' (not in 'visible-directaccess-warn' subset)!
   [255]
   $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d  2db36d8066ff
   Warning: accessing hidden changesets 2db36d8066ff for write operation
@@ -761,4 +758,5 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  2 new obsolescence markers
+  pushing 33 obsolescence markers (3284 bytes)
+  2 obsolescence markers added
diff -r 9be1cadf7a07 -r 5f6e78aea094 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Wed Jun 24 20:06:45 2015 -0700
+++ b/tests/test-obsolete.t	Thu Jun 25 16:55:27 2015 -0700
@@ -184,7 +184,8 @@
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
-  2 new obsolescence markers
+  pushing 2 obsolescence markers (133 bytes)
+  2 obsolescence markers added
   $ hg -R ../other-new verify
   checking changesets
   checking manifests
@@ -238,7 +239,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  1 new obsolescence markers
+  pushing 3 obsolescence markers (199 bytes)
+  1 obsolescence markers added
   $ qlog -R ../other-new
   5
   - 95de7fc6918d
@@ -260,6 +262,8 @@
   pushing to ../other-new
   searching for changes
   no changes found
+  pushing 3 obsolescence markers (199 bytes)
+  0 obsolescence markers added
   [1]
 
   $ hg up --hidden -q .^ # 3
@@ -275,8 +279,9 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  1 new obsolescence markers
-  (run 'hg heads .' to see heads, 'hg merge' to merge)
+  pull obsolescence markers
+  1 obsolescence markers added
+  (run 'hg heads' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
   - 909a0fb57e5d
@@ -365,8 +370,9 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  1 new obsolescence markers
-  (run 'hg heads .' to see heads, 'hg merge' to merge)
+  pull obsolescence markers
+  1 obsolescence markers added
+  (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg up -q 7 # to check rollback update behavior
   $ qlog
@@ -389,7 +395,6 @@
   branch: default
   commit: 1 deleted, 2 unknown (clean)
   update: 2 new changesets, 2 branch heads (merge)
-  phases: 4 draft
   unstable: 1 changesets
   $ qlog
   6
@@ -539,7 +544,8 @@
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to [12] files (re)
-  3 new obsolescence markers
+  pushing 7 obsolescence markers (491 bytes)
+  3 obsolescence markers added
   $ hg up -q 10
   $ mkcommit "obsol_d'''"
   created new head
@@ -551,7 +557,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  1 new obsolescence markers
+  pushing 8 obsolescence markers (557 bytes)
+  1 obsolescence markers added
   $ cd ..
 
 check bumped detection
@@ -663,7 +670,6 @@
   branch: default
   commit: (clean)
   update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
-  phases: 3 draft
   bumped: 1 changesets
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
   $ hg log -r 'divergent()'
diff -r 9be1cadf7a07 -r 5f6e78aea094 tests/test-sharing.t
--- a/tests/test-sharing.t	Wed Jun 24 20:06:45 2015 -0700
+++ b/tests/test-sharing.t	Thu Jun 25 16:55:27 2015 -0700
@@ -46,6 +46,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pull obsolescence markers
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Let's commit a preliminary change and push it to ``test-repo`` for
@@ -87,7 +88,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  2 new obsolescence markers
+  pull obsolescence markers
+  2 obsolescence markers added
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Figure SG03
@@ -138,7 +140,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  4 new obsolescence markers
+  pushing 4 obsolescence markers (369 bytes)
+  4 obsolescence markers added
 
 Now that the fix is public, we cannot amend it any more.
   $ hg amend -m 'fix bug 37'
@@ -158,6 +161,8 @@
   pushing to ../dev-repo
   searching for changes
   no changes found
+  pushing 4 obsolescence markers (369 bytes)
+  0 obsolescence markers added
   [1]
   $ hg -R ../dev-repo shortlog -r 'draft()'
 
@@ -191,6 +196,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pushing 4 obsolescence markers (369 bytes)
+  0 obsolescence markers added
   exporting bookmark bug15
   $ hg -R ../review bookmarks
      bug15                     2:f91e97234c2b
@@ -206,7 +213,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  2 new obsolescence markers
+  pushing 6 obsolescence markers (553 bytes)
+  2 obsolescence markers added
   updating bookmark bug15
   $ hg -R ../review bookmarks
      bug15                     3:cbdfbd5a5db2
@@ -233,6 +241,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  pushing 4 obsolescence markers (369 bytes)
+  0 obsolescence markers added
   exporting bookmark featureX
   $ hg -R ../review bookmarks
      bug15                     3:cbdfbd5a5db2
@@ -249,7 +259,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  2 new obsolescence markers
+  pushing 6 obsolescence markers (553 bytes)
+  2 obsolescence markers added
   updating bookmark featureX
 
 Bob receives second review, amends, and pushes to public:
@@ -263,7 +274,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  4 new obsolescence markers
+  pushing 8 obsolescence markers (736 bytes)
+  4 obsolescence markers added
   $ hg -R ../public bookmarks
   no bookmarks set
   $ hg push ../review
@@ -274,7 +286,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  2 new obsolescence markers
+  pushing 8 obsolescence markers (736 bytes)
+  2 obsolescence markers added
   updating bookmark featureX
   $ hg -R ../review bookmarks
      bug15                     3:cbdfbd5a5db2
@@ -344,7 +357,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  4 new obsolescence markers
+  pull obsolescence markers
+  4 obsolescence markers added
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg log -G -q -r 'head()'
   o  5:540ba8f317e6
@@ -374,7 +388,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  3 new obsolescence markers
+  pushing 11 obsolescence markers (999 bytes)
+  3 obsolescence markers added
   $ hg push ../review
   pushing to ../review
   searching for changes
@@ -382,7 +397,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 1 files
-  1 new obsolescence markers
+  pushing 11 obsolescence markers (999 bytes)
+  1 obsolescence markers added
   updating bookmark bug15
 
 Figure SG08: review and public changesets after Alice pushes.
@@ -444,6 +460,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pull obsolescence markers
+  0 obsolescence markers added
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 'better fix (alice)' >> file1
   $ hg amend -u alice -m 'fix bug 24 (v2 by alice)'
@@ -471,7 +489,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  2 new obsolescence markers
+  pull obsolescence markers
+  2 obsolescence markers added
   (run 'hg heads' to see heads, 'hg merge' to merge)
   2 new divergent changesets
 
diff -r 9be1cadf7a07 -r 5f6e78aea094 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Wed Jun 24 20:06:45 2015 -0700
+++ b/tests/test-stabilize-result.t	Thu Jun 25 16:55:27 2015 -0700
@@ -307,7 +307,6 @@
   branch: default
   commit: (clean)
   update: 2 new changesets, 2 branch heads (merge)
-  phases: 3 draft
   $ hg export .
   # HG changeset patch
   # User test
diff -r 9be1cadf7a07 -r 5f6e78aea094 tests/test-tutorial.t
--- a/tests/test-tutorial.t	Wed Jun 24 20:06:45 2015 -0700
+++ b/tests/test-tutorial.t	Thu Jun 25 16:55:27 2015 -0700
@@ -224,6 +224,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  pull obsolescence markers
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 I now have a new heads. Note that this remote head is immutable
@@ -405,7 +406,8 @@
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
-  6 new obsolescence markers
+  pushing 6 obsolescence markers (529 bytes)
+  6 obsolescence markers added
 
 for simplicity sake we get the bathroom change in line again
 
@@ -526,7 +528,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  1 new obsolescence markers
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (public): bathroom stuff
@@ -583,7 +586,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  1 new obsolescence markers
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (draft): bathroom stuff
@@ -643,6 +647,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  pull obsolescence markers
+  0 obsolescence markers added
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
 
@@ -732,7 +738,8 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
-  3 new obsolescence markers
+  pushing 10 obsolescence markers (873 bytes)
+  3 obsolescence markers added
 
 remote get a warning that current working directory is based on an obsolete changeset
 
@@ -741,6 +748,8 @@
   pulling from $TESTTMP/local (glob)
   searching for changes
   no changes found
+  pull obsolescence markers
+  0 obsolescence markers added
   working directory parent is obsolete!
   (use "hg evolve" to update to its successor)
 
@@ -773,6 +782,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pull obsolescence markers
+  0 obsolescence markers added
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  99f039c5ec9e (draft): SPAM SPAM SPAM
diff -r 9be1cadf7a07 -r 5f6e78aea094 tests/test-uncommit.t
--- a/tests/test-uncommit.t	Wed Jun 24 20:06:45 2015 -0700
+++ b/tests/test-uncommit.t	Thu Jun 25 16:55:27 2015 -0700
@@ -138,6 +138,7 @@
 
   $ hg branch foo
   marked working directory as branch foo
+  (branches are permanent and global, did you want a bookmark?)
   $ hg mv ff f
   $ hg mv h i
   $ hg rm j
diff -r 9be1cadf7a07 -r 5f6e78aea094 tests/test-wireproto-bundle1.t
--- a/tests/test-wireproto-bundle1.t	Wed Jun 24 20:06:45 2015 -0700
+++ b/tests/test-wireproto-bundle1.t	Thu Jun 25 16:55:27 2015 -0700
@@ -50,6 +50,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
+  pull obsolescence markers
   (run 'hg update' to get a working copy)
   $ hg push -R ../other
   pushing to ssh://user@dummy/server
@@ -69,7 +70,8 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  remote: 2 new obsolescence markers
+  pushing 2 obsolescence markers (184 bytes)
+  remote: 2 obsolescence markers added
   $ hg push
   pushing to ssh://user@dummy/server
   searching for changes
@@ -86,8 +88,9 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  2 new obsolescence markers
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  pull obsolescence markers
+  2 obsolescence markers added
+  (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
   searching for changes