# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1435279063 25200
# Node ID 1bcbd14cf159291ad6de83ffdc5003f3ee8295c5
# Parent  5f6e78aea09441c49971819b40fc17d8f4bbb960# Parent  73eb4f33f9dc7a8feeadea4a860a2764c5be431e
merge back with 3.3 compat branch

diff -r 5f6e78aea094 -r 1bcbd14cf159 hgext/evolve.py
diff -r 5f6e78aea094 -r 1bcbd14cf159 setup.py
diff -r 5f6e78aea094 -r 1bcbd14cf159 tests/test-amend.t
diff -r 5f6e78aea094 -r 1bcbd14cf159 tests/test-corrupt.t
--- a/tests/test-corrupt.t	Thu Jun 25 16:55:27 2015 -0700
+++ b/tests/test-corrupt.t	Thu Jun 25 17:37:43 2015 -0700
@@ -110,7 +110,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
-  pushing 2 obsolescence markers (160 bytes)
+  pushing 2 obsolescence markers (*) (glob)
   2 obsolescence markers added
   $ hg -R ../other verify
   checking changesets
diff -r 5f6e78aea094 -r 1bcbd14cf159 tests/test-inhibit.t
--- a/tests/test-inhibit.t	Thu Jun 25 16:55:27 2015 -0700
+++ b/tests/test-inhibit.t	Thu Jun 25 17:37:43 2015 -0700
@@ -758,5 +758,5 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pushing 33 obsolescence markers (3284 bytes)
+  pushing 33 obsolescence markers (*) (glob)
   2 obsolescence markers added
diff -r 5f6e78aea094 -r 1bcbd14cf159 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Thu Jun 25 16:55:27 2015 -0700
+++ b/tests/test-obsolete.t	Thu Jun 25 17:37:43 2015 -0700
@@ -184,7 +184,7 @@
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
-  pushing 2 obsolescence markers (133 bytes)
+  pushing 2 obsolescence markers (*) (glob)
   2 obsolescence markers added
   $ hg -R ../other-new verify
   checking changesets
@@ -239,7 +239,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 3 obsolescence markers (199 bytes)
+  pushing 3 obsolescence markers (*) (glob)
   1 obsolescence markers added
   $ qlog -R ../other-new
   5
@@ -262,7 +262,7 @@
   pushing to ../other-new
   searching for changes
   no changes found
-  pushing 3 obsolescence markers (199 bytes)
+  pushing 3 obsolescence markers (*) (glob)
   0 obsolescence markers added
   [1]
 
@@ -544,7 +544,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to [12] files (re)
-  pushing 7 obsolescence markers (491 bytes)
+  pushing 7 obsolescence markers (*) (glob)
   3 obsolescence markers added
   $ hg up -q 10
   $ mkcommit "obsol_d'''"
@@ -557,7 +557,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 8 obsolescence markers (557 bytes)
+  pushing 8 obsolescence markers (*) (glob)
   1 obsolescence markers added
   $ cd ..
 
diff -r 5f6e78aea094 -r 1bcbd14cf159 tests/test-sharing.t
--- a/tests/test-sharing.t	Thu Jun 25 16:55:27 2015 -0700
+++ b/tests/test-sharing.t	Thu Jun 25 17:37:43 2015 -0700
@@ -140,7 +140,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pushing 4 obsolescence markers (369 bytes)
+  pushing 4 obsolescence markers (*) (glob)
   4 obsolescence markers added
 
 Now that the fix is public, we cannot amend it any more.
@@ -161,7 +161,7 @@
   pushing to ../dev-repo
   searching for changes
   no changes found
-  pushing 4 obsolescence markers (369 bytes)
+  pushing 4 obsolescence markers (*) (glob)
   0 obsolescence markers added
   [1]
   $ hg -R ../dev-repo shortlog -r 'draft()'
@@ -196,7 +196,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pushing 4 obsolescence markers (369 bytes)
+  pushing 4 obsolescence markers (*) (glob)
   0 obsolescence markers added
   exporting bookmark bug15
   $ hg -R ../review bookmarks
@@ -213,7 +213,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 6 obsolescence markers (553 bytes)
+  pushing 6 obsolescence markers (*) (glob)
   2 obsolescence markers added
   updating bookmark bug15
   $ hg -R ../review bookmarks
@@ -241,7 +241,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 4 obsolescence markers (369 bytes)
+  pushing 4 obsolescence markers (*) (glob)
   0 obsolescence markers added
   exporting bookmark featureX
   $ hg -R ../review bookmarks
@@ -259,7 +259,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 6 obsolescence markers (553 bytes)
+  pushing 6 obsolescence markers (*) (glob)
   2 obsolescence markers added
   updating bookmark featureX
 
@@ -274,7 +274,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pushing 8 obsolescence markers (736 bytes)
+  pushing 8 obsolescence markers (*) (glob)
   4 obsolescence markers added
   $ hg -R ../public bookmarks
   no bookmarks set
@@ -286,7 +286,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 8 obsolescence markers (736 bytes)
+  pushing 8 obsolescence markers (*) (glob)
   2 obsolescence markers added
   updating bookmark featureX
   $ hg -R ../review bookmarks
@@ -388,7 +388,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pushing 11 obsolescence markers (999 bytes)
+  pushing 11 obsolescence markers (*) (glob)
   3 obsolescence markers added
   $ hg push ../review
   pushing to ../review
@@ -397,7 +397,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 1 files
-  pushing 11 obsolescence markers (999 bytes)
+  pushing 11 obsolescence markers (*) (glob)
   1 obsolescence markers added
   updating bookmark bug15
 
diff -r 5f6e78aea094 -r 1bcbd14cf159 tests/test-simple4server.t
--- a/tests/test-simple4server.t	Thu Jun 25 16:55:27 2015 -0700
+++ b/tests/test-simple4server.t	Thu Jun 25 17:37:43 2015 -0700
@@ -96,7 +96,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 2 obsolescence markers (* bytes) (glob)
+  pushing 2 obsolescence markers (*) (glob)
   $ cat ../errors.log
   $ hg push
   pushing to http://localhost:$HGPORT/
diff -r 5f6e78aea094 -r 1bcbd14cf159 tests/test-tutorial.t
--- a/tests/test-tutorial.t	Thu Jun 25 16:55:27 2015 -0700
+++ b/tests/test-tutorial.t	Thu Jun 25 17:37:43 2015 -0700
@@ -406,7 +406,7 @@
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
-  pushing 6 obsolescence markers (529 bytes)
+  pushing 6 obsolescence markers (*) (glob)
   6 obsolescence markers added
 
 for simplicity sake we get the bathroom change in line again
@@ -738,7 +738,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
-  pushing 10 obsolescence markers (873 bytes)
+  pushing 10 obsolescence markers (*) (glob)
   3 obsolescence markers added
 
 remote get a warning that current working directory is based on an obsolete changeset
diff -r 5f6e78aea094 -r 1bcbd14cf159 tests/test-wireproto-bundle1.t
--- a/tests/test-wireproto-bundle1.t	Thu Jun 25 16:55:27 2015 -0700
+++ b/tests/test-wireproto-bundle1.t	Thu Jun 25 17:37:43 2015 -0700
@@ -70,7 +70,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 2 obsolescence markers (184 bytes)
+  pushing 2 obsolescence markers (*) (glob)
   remote: 2 obsolescence markers added
   $ hg push
   pushing to ssh://user@dummy/server
diff -r 5f6e78aea094 -r 1bcbd14cf159 tests/test-wireproto.t