--- a/tests/test-subrepo.t Wed Sep 22 16:05:59 2010 -0500
+++ b/tests/test-subrepo.t Wed Sep 22 16:06:00 2010 -0500
@@ -236,19 +236,19 @@
$ cd ..
$ hg clone t tc
updating to branch default
- pulling subrepo s from .*/sub/t/s
+ pulling subrepo s from .*/sub/t/s (re)
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 5 changes to 3 files
- pulling subrepo s/ss from .*/sub/t/s/ss
+ pulling subrepo s/ss from .*/sub/t/s/ss (re)
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- pulling subrepo t from .*/sub/t/t
+ pulling subrepo t from .*/sub/t/t (re)
requesting all changes
adding changesets
adding manifests
@@ -270,14 +270,14 @@
$ hg ci -m11
committing subrepository t
$ hg push
- pushing .*sub/t
- pushing .*sub/t/s/ss
+ pushing .*sub/t (re)
+ pushing .*sub/t/s/ss (re)
searching for changes
no changes found
- pushing .*sub/t/s
+ pushing .*sub/t/s (re)
searching for changes
no changes found
- pushing .*sub/t/t
+ pushing .*sub/t/t (re)
searching for changes
adding changesets
adding manifests
@@ -295,27 +295,27 @@
$ hg ci -m12
committing subrepository s
$ hg push
- pushing .*sub/t
- pushing .*sub/t/s/ss
+ pushing .*sub/t (re)
+ pushing .*sub/t/s/ss (re)
searching for changes
no changes found
- pushing .*sub/t/s
+ pushing .*sub/t/s (re)
searching for changes
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)
[255]
$ hg push -f
- pushing .*sub/t
- pushing .*sub/t/s/ss
+ pushing .*sub/t (re)
+ pushing .*sub/t/s/ss (re)
searching for changes
no changes found
- pushing .*sub/t/s
+ pushing .*sub/t/s (re)
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- pushing .*sub/t/t
+ pushing .*sub/t/t (re)
searching for changes
no changes found
searching for changes
@@ -337,7 +337,7 @@
$ cd ../tc
$ hg pull
- pulling .*sub/t
+ pulling .*sub/t (re)
searching for changes
adding changesets
adding manifests
@@ -348,7 +348,7 @@
should pull t
$ hg up
- pulling subrepo t from .*/sub/t/t
+ pulling subrepo t from .*/sub/t/t (re)
searching for changes
adding changesets
adding manifests
@@ -541,9 +541,9 @@
$ cat mercurial2/main/nested_absolute/.hg/hgrc \
> mercurial2/main/nested_relative/.hg/hgrc
[paths]
- default = .*/test-subrepo\.t/sub/mercurial/nested_absolute
+ default = .*/test-subrepo\.t/sub/mercurial/nested_absolute (re)
[paths]
- default = .*/test-subrepo\.t/sub/mercurial/nested_relative
+ default = .*/test-subrepo\.t/sub/mercurial/nested_relative (re)
$ rm -rf mercurial mercurial2
issue 1977
@@ -559,7 +559,7 @@
committing subrepository s
$ hg clone repo repo2
updating to branch default
- pulling subrepo s from .*/sub/repo/s
+ pulling subrepo s from .*/sub/repo/s (re)
requesting all changes
adding changesets
adding manifests