diff tests/test-obsolete.t @ 46:3b0364fc822f

Do not propagate obsolete changeset
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 08 Sep 2011 16:46:58 +0200
parents d89453a10991
children 4e804af47e57
line wrap: on
line diff
--- a/tests/test-obsolete.t	Thu Sep 08 14:02:29 2011 +0200
+++ b/tests/test-obsolete.t	Thu Sep 08 16:46:58 2011 +0200
@@ -58,19 +58,19 @@
 Test communication of obsolete relation with a compatible client
 
   $ hg init ../other-new
-  $ hg push ../other-new
+  $ hg push --traceback ../other-new
   pushing to ../other-new
   searching for changes
   adding changesets
   adding manifests
   adding file changes
-  added 6 changesets with 6 changes to 6 files (+2 heads)
+  added 5 changesets with 5 changes to 5 files (+1 heads)
   $ qlog -R ../other-new -r 'obsolete()'
-  3 0d3f46688ccc
+  2 0d3f46688ccc
   $ qlog -R ../other-new
-  5 a7a6f2b5d8a5
-  4 725c380fe99b
-  3 0d3f46688ccc
+  4 a7a6f2b5d8a5
+  3 725c380fe99b
+  2 0d3f46688ccc
   1 7c3bad9141dc
   0 1f0dee641bb7
   $ hg up 3 -q
@@ -93,13 +93,13 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   $ qlog -R ../other-new
-  6 95de7fc6918d
-  4 725c380fe99b
-  3 0d3f46688ccc
+  5 95de7fc6918d
+  3 725c380fe99b
+  2 0d3f46688ccc
   1 7c3bad9141dc
   0 1f0dee641bb7
   $ qlog -R ../other-new -r 'obsolete()'
-  3 0d3f46688ccc
+  2 0d3f46688ccc
   $ hg up -q .^
   $ mkcommit "obsol_d'" # 7
   created new head
@@ -110,12 +110,31 @@
   adding changesets
   adding manifests
   adding file changes
-  added 1 changesets with 1 changes to 1 files (+1 heads)
+  added 2 changesets with 2 changes to 2 files (+2 heads)
   (run 'hg heads .' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   7 909a0fb57e5d
-  4 725c380fe99b
-  3 0d3f46688ccc
+  3 725c380fe99b
+  2 0d3f46688ccc
+  1 7c3bad9141dc
+  0 1f0dee641bb7
+
+pushing to stuff that doesn't support obsolete
+
+  $ hg init ../other-old
+  $ echo '[extensions]'  > ../other-old/.hg/hgrc
+  $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc
+  $ hg push ../other-old
+  pushing to ../other-old
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 5 changesets with 5 changes to 5 files (+1 heads)
+  $ qlog -R ../other-old
+  4 909a0fb57e5d
+  3 725c380fe99b
+  2 0d3f46688ccc
   1 7c3bad9141dc
   0 1f0dee641bb7