diff tests/test-convert-hg-source.t @ 13969:336bb8b53ad0

merge with stable
author Patrick Mezard <pmezard@gmail.com>
date Wed, 20 Apr 2011 23:30:07 +0200
parents 2f93a4a10144 82845434e974
children db0340f4b507
line wrap: on
line diff
--- a/tests/test-convert-hg-source.t	Wed Apr 20 14:28:40 2011 -0500
+++ b/tests/test-convert-hg-source.t	Wed Apr 20 23:30:07 2011 +0200
@@ -34,24 +34,18 @@
   created new head
   $ chmod +x baz
   $ hg ci -m 'mark baz executable' -d '5 0'
-  $ hg branch foo
-  marked working directory as branch foo
-  $ hg ci -m 'branch foo' -d '6 0'
-  $ hg ci --close-branch -m 'close' -d '7 0'
   $ cd ..
   $ hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
   initializing destination new repository
   scanning source...
   sorting...
   converting...
-  7 add foo bar
-  6 change foo
-  5 make bar and baz copies of foo
-  4 merge local copy
-  3 merge remote copy
-  2 mark baz executable
-  1 branch foo
-  0 close
+  5 add foo bar
+  4 change foo
+  3 make bar and baz copies of foo
+  2 merge local copy
+  1 merge remote copy
+  0 mark baz executable
   updating bookmarks
   $ cd new
   $ hg out ../orig
@@ -61,7 +55,7 @@
   [1]
   $ hg bookmarks
      premerge1                 3:973ef48a98a4
-     premerge2                 7:0d18d1112f1d
+     premerge2                 5:13d9b87cf8f8
   $ cd ..
 
 check shamap LF and CRLF handling