diff --git a/tests/test-push-r.out b/tests/test-push-r.out deleted file mode 100644 index 4473b3c1f2da8b22cb9c7db78d2b03669fcd598a_dGVzdHMvdGVzdC1wdXNoLXIub3V0..0000000000000000000000000000000000000000 --- a/tests/test-push-r.out +++ /dev/null @@ -1,114 +0,0 @@ -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -created new head -1 files updated, 0 files merged, 2 files removed, 0 files unresolved -pushing to test-0 -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -checking changesets -checking manifests -crosschecking files in changesets and manifests -checking files -1 files, 1 changesets, 1 total revisions -pushing to test-1 -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -checking changesets -checking manifests -crosschecking files in changesets and manifests -checking files -1 files, 2 changesets, 2 total revisions -pushing to test-2 -searching for changes -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files -checking changesets -checking manifests -crosschecking files in changesets and manifests -checking files -1 files, 3 changesets, 3 total revisions -pushing to test-3 -searching for changes -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 1 files -checking changesets -checking manifests -crosschecking files in changesets and manifests -checking files -1 files, 4 changesets, 4 total revisions -pushing to test-4 -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -checking changesets -checking manifests -crosschecking files in changesets and manifests -checking files -1 files, 2 changesets, 2 total revisions -pushing to test-5 -searching for changes -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files -checking changesets -checking manifests -crosschecking files in changesets and manifests -checking files -1 files, 3 changesets, 3 total revisions -pushing to test-6 -searching for changes -adding changesets -adding manifests -adding file changes -added 4 changesets with 5 changes to 2 files -checking changesets -checking manifests -crosschecking files in changesets and manifests -checking files -2 files, 4 changesets, 5 total revisions -pushing to test-7 -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 6 changes to 3 files -checking changesets -checking manifests -crosschecking files in changesets and manifests -checking files -3 files, 5 changesets, 6 total revisions -pushing to test-8 -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 2 files -checking changesets -checking manifests -crosschecking files in changesets and manifests -checking files -2 files, 5 changesets, 5 total revisions -pulling from ../test-7 -searching for changes -adding changesets -adding manifests -adding file changes -added 4 changesets with 2 changes to 3 files (+1 heads) -(run 'hg heads' to see heads, 'hg merge' to merge) -checking changesets -checking manifests -crosschecking files in changesets and manifests -checking files -4 files, 9 changesets, 7 total revisions diff --git a/tests/test-push-r b/tests/test-push-r.t similarity index 0% rename from tests/test-push-r rename to tests/test-push-r.t index 4473b3c1f2da8b22cb9c7db78d2b03669fcd598a_dGVzdHMvdGVzdC1wdXNoLXI=..d298abb841acc1529681871e1ed9da6c941a2af9_dGVzdHMvdGVzdC1wdXNoLXIudA== 100755 --- a/tests/test-push-r +++ b/tests/test-push-r.t @@ -1,5 +1,3 @@ -#!/bin/sh - -# bail if the user does not have dulwich -python -c 'import dulwich, dulwich.repo' || exit 80 +bail if the user does not have dulwich + $ python -c 'import dulwich, dulwich.repo' || exit 80 @@ -5,6 +3,6 @@ -echo "[extensions]" >> $HGRCPATH -echo "hggit=$(echo $(dirname $(dirname $0)))/hggit" >> $HGRCPATH -echo 'hgext.graphlog =' >> $HGRCPATH -echo 'hgext.bookmarks =' >> $HGRCPATH + $ echo "[extensions]" >> $HGRCPATH + $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH + $ echo 'hgext.graphlog =' >> $HGRCPATH + $ echo 'hgext.bookmarks =' >> $HGRCPATH @@ -10,54 +8,168 @@ -hg init test -cd test -cat >>afile <<EOF -0 -EOF -hg add afile -hg commit -m "0.0" -cat >>afile <<EOF -1 -EOF -hg commit -m "0.1" -cat >>afile <<EOF -2 -EOF -hg commit -m "0.2" -cat >>afile <<EOF -3 -EOF -hg commit -m "0.3" -hg update -C 0 -cat >>afile <<EOF -1 -EOF -hg commit -m "1.1" -cat >>afile <<EOF -2 -EOF -hg commit -m "1.2" -cat >fred <<EOF -a line -EOF -cat >>afile <<EOF -3 -EOF -hg add fred -hg commit -m "1.3" -hg mv afile adifferentfile -hg commit -m "1.3m" -hg update -C 3 -hg mv afile anotherfile -hg commit -m "0.3m" -cd .. -for i in 0 1 2 3 4 5 6 7 8; do - mkdir test-"$i" - hg --cwd test-"$i" init - hg -R test push -r "$i" test-"$i" - cd test-"$i" - hg verify - cd .. -done -cd test-8 -hg pull ../test-7 -hg verify + $ hg init test + $ cd test + $ cat >>afile <<EOF + > 0 + > EOF + $ hg add afile + $ hg commit -m "0.0" + $ cat >>afile <<EOF + > 1 + > EOF + $ hg commit -m "0.1" + $ cat >>afile <<EOF + > 2 + > EOF + $ hg commit -m "0.2" + $ cat >>afile <<EOF + > 3 + > EOF + $ hg commit -m "0.3" + $ hg update -C 0 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cat >>afile <<EOF + > 1 + > EOF + $ hg commit -m "1.1" + created new head + $ cat >>afile <<EOF + > 2 + > EOF + $ hg commit -m "1.2" + $ cat >fred <<EOF + > a line + > EOF + $ cat >>afile <<EOF + > 3 + > EOF + $ hg add fred + $ hg commit -m "1.3" + $ hg mv afile adifferentfile + $ hg commit -m "1.3m" + $ hg update -C 3 + 1 files updated, 0 files merged, 2 files removed, 0 files unresolved + $ hg mv afile anotherfile + $ hg commit -m "0.3m" + $ cd .. + $ for i in 0 1 2 3 4 5 6 7 8; do + > mkdir test-"$i" + > hg --cwd test-"$i" init + > hg -R test push -r "$i" test-"$i" + > cd test-"$i" + > hg verify + > cd .. + > done + pushing to test-0 + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 1 files, 1 changesets, 1 total revisions + pushing to test-1 + searching for changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 1 files + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 1 files, 2 changesets, 2 total revisions + pushing to test-2 + searching for changes + adding changesets + adding manifests + adding file changes + added 3 changesets with 3 changes to 1 files + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 1 files, 3 changesets, 3 total revisions + pushing to test-3 + searching for changes + adding changesets + adding manifests + adding file changes + added 4 changesets with 4 changes to 1 files + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 1 files, 4 changesets, 4 total revisions + pushing to test-4 + searching for changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 1 files + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 1 files, 2 changesets, 2 total revisions + pushing to test-5 + searching for changes + adding changesets + adding manifests + adding file changes + added 3 changesets with 3 changes to 1 files + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 1 files, 3 changesets, 3 total revisions + pushing to test-6 + searching for changes + adding changesets + adding manifests + adding file changes + added 4 changesets with 5 changes to 2 files + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 2 files, 4 changesets, 5 total revisions + pushing to test-7 + searching for changes + adding changesets + adding manifests + adding file changes + added 5 changesets with 6 changes to 3 files + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 3 files, 5 changesets, 6 total revisions + pushing to test-8 + searching for changes + adding changesets + adding manifests + adding file changes + added 5 changesets with 5 changes to 2 files + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 2 files, 5 changesets, 5 total revisions + $ cd test-8 + $ hg pull ../test-7 + pulling from ../test-7 + searching for changes + adding changesets + adding manifests + adding file changes + added 4 changesets with 2 changes to 3 files (+1 heads) + (run 'hg heads' to see heads, 'hg merge' to merge) + $ hg verify + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 4 files, 9 changesets, 7 total revisions