# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1283497956 -7200
# Node ID fb0c6373ec367c0613b0ef1e8fb933d834f01741
# Parent  6045d467abd77b8756b73c650f446ae1ef4f4810
tests: unify test-empty-group

diff -r 6045d467abd7 -r fb0c6373ec36 tests/test-empty-group
--- a/tests/test-empty-group	Fri Sep 10 01:04:32 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-#  A          B
-#
-#  3  4       3
-#  |\/|       |\
-#  |/\|       | \
-#  1  2       1  2
-#  \ /        \ /
-#   0          0
-#
-# if the result of the merge of 1 and 2
-# is the same in 3 and 4, no new manifest
-# will be created and the manifest group
-# will be empty during the pull
-#
-# (plus we test a failure where outgoing
-# wrongly reported the number of csets)
-#
-
-hg init a
-cd a
-touch init
-hg ci -A -m 0
-touch x y
-hg ci -A -m 1
-hg update 0
-touch x y
-hg ci -A -m 2
-hg merge 1
-hg ci -A -m m1
-#hg log
-#hg debugindex .hg/store/00manifest.i
-hg update -C 1
-hg merge 2
-hg ci -A -m m2
-#hg log
-#hg debugindex .hg/store/00manifest.i
-
-cd ..
-hg clone -r 3 a b
-hg clone -r 4 a c
-hg -R a outgoing b
-hg -R a outgoing c
-hg -R b outgoing c
-hg -R c outgoing b
-
-hg -R b pull a
-hg -R c pull a
diff -r 6045d467abd7 -r fb0c6373ec36 tests/test-empty-group.out
--- a/tests/test-empty-group.out	Fri Sep 10 01:04:32 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-adding init
-adding x
-adding y
-0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-adding x
-adding y
-created new head
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-created new head
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 3 changes to 3 files
-updating to branch default
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 3 changes to 3 files
-updating to branch default
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-comparing with b
-searching for changes
-changeset:   4:119caaef4ed1
-tag:         tip
-parent:      1:79f9e10cd04e
-parent:      2:8e1bb01c1a24
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     m2
-
-comparing with c
-searching for changes
-changeset:   3:cbb48b367d1b
-parent:      2:8e1bb01c1a24
-parent:      1:79f9e10cd04e
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     m1
-
-comparing with c
-searching for changes
-changeset:   3:cbb48b367d1b
-tag:         tip
-parent:      2:8e1bb01c1a24
-parent:      1:79f9e10cd04e
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     m1
-
-comparing with b
-searching for changes
-changeset:   3:119caaef4ed1
-tag:         tip
-parent:      1:79f9e10cd04e
-parent:      2:8e1bb01c1a24
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     m2
-
-pulling from a
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 0 changes to 0 files (+1 heads)
-(run 'hg heads' to see heads, 'hg merge' to merge)
-pulling from a
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 0 changes to 0 files (+1 heads)
-(run 'hg heads' to see heads, 'hg merge' to merge)
diff -r 6045d467abd7 -r fb0c6373ec36 tests/test-empty-group.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-empty-group.t	Fri Sep 03 09:12:36 2010 +0200
@@ -0,0 +1,138 @@
+#
+#  A          B
+#
+#  3  4       3
+#  |\/|       |\
+#  |/\|       | \
+#  1  2       1  2
+#  \ /        \ /
+#   0          0
+#
+# if the result of the merge of 1 and 2
+# is the same in 3 and 4, no new manifest
+# will be created and the manifest group
+# will be empty during the pull
+#
+# (plus we test a failure where outgoing
+# wrongly reported the number of csets)
+#
+
+  $ hg init a
+  $ cd a
+  $ touch init
+  $ hg ci -A -m 0
+  adding init
+  $ touch x y
+  $ hg ci -A -m 1
+  adding x
+  adding y
+
+  $ hg update 0
+  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ touch x y
+  $ hg ci -A -m 2
+  adding x
+  adding y
+  created new head
+
+  $ hg merge 1
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg ci -A -m m1
+
+#hg log
+#hg debugindex .hg/store/00manifest.i
+
+  $ hg update -C 1
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg merge 2
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg ci -A -m m2
+  created new head
+
+#hg log
+#hg debugindex .hg/store/00manifest.i
+
+  $ cd ..
+
+  $ hg clone -r 3 a b
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 4 changesets with 3 changes to 3 files
+  updating to branch default
+  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+  $ hg clone -r 4 a c
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 4 changesets with 3 changes to 3 files
+  updating to branch default
+  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+  $ hg -R a outgoing b
+  comparing with b
+  searching for changes
+  changeset:   4:119caaef4ed1
+  tag:         tip
+  parent:      1:79f9e10cd04e
+  parent:      2:8e1bb01c1a24
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     m2
+  
+  $ hg -R a outgoing c
+  comparing with c
+  searching for changes
+  changeset:   3:cbb48b367d1b
+  parent:      2:8e1bb01c1a24
+  parent:      1:79f9e10cd04e
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     m1
+  
+  $ hg -R b outgoing c
+  comparing with c
+  searching for changes
+  changeset:   3:cbb48b367d1b
+  tag:         tip
+  parent:      2:8e1bb01c1a24
+  parent:      1:79f9e10cd04e
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     m1
+  
+  $ hg -R c outgoing b
+  comparing with b
+  searching for changes
+  changeset:   3:119caaef4ed1
+  tag:         tip
+  parent:      1:79f9e10cd04e
+  parent:      2:8e1bb01c1a24
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     m2
+  
+
+  $ hg -R b pull a
+  pulling from a
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 0 changes to 0 files (+1 heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
+
+  $ hg -R c pull a
+  pulling from a
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 0 changes to 0 files (+1 heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
+