Skip to content
Snippets Groups Projects
Commit d298abb8 authored by David M. Carr's avatar David M. Carr
Browse files

tests: unify test-push-r

parent 4473b3c1
No related branches found
No related tags found
No related merge requests found
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
#!/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 @@ ...@@ -5,6 +3,6 @@
echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $HGRCPATH
echo "hggit=$(echo $(dirname $(dirname $0)))/hggit" >> $HGRCPATH $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
echo 'hgext.graphlog =' >> $HGRCPATH $ echo 'hgext.graphlog =' >> $HGRCPATH
echo 'hgext.bookmarks =' >> $HGRCPATH $ echo 'hgext.bookmarks =' >> $HGRCPATH
...@@ -10,54 +8,168 @@ ...@@ -10,54 +8,168 @@
hg init test $ hg init test
cd test $ cd test
cat >>afile <<EOF $ cat >>afile <<EOF
0 > 0
EOF > EOF
hg add afile $ hg add afile
hg commit -m "0.0" $ hg commit -m "0.0"
cat >>afile <<EOF $ cat >>afile <<EOF
1 > 1
EOF > EOF
hg commit -m "0.1" $ hg commit -m "0.1"
cat >>afile <<EOF $ cat >>afile <<EOF
2 > 2
EOF > EOF
hg commit -m "0.2" $ hg commit -m "0.2"
cat >>afile <<EOF $ cat >>afile <<EOF
3 > 3
EOF > EOF
hg commit -m "0.3" $ hg commit -m "0.3"
hg update -C 0 $ hg update -C 0
cat >>afile <<EOF 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 $ cat >>afile <<EOF
EOF > 1
hg commit -m "1.1" > EOF
cat >>afile <<EOF $ hg commit -m "1.1"
2 created new head
EOF $ cat >>afile <<EOF
hg commit -m "1.2" > 2
cat >fred <<EOF > EOF
a line $ hg commit -m "1.2"
EOF $ cat >fred <<EOF
cat >>afile <<EOF > a line
3 > EOF
EOF $ cat >>afile <<EOF
hg add fred > 3
hg commit -m "1.3" > EOF
hg mv afile adifferentfile $ hg add fred
hg commit -m "1.3m" $ hg commit -m "1.3"
hg update -C 3 $ hg mv afile adifferentfile
hg mv afile anotherfile $ hg commit -m "1.3m"
hg commit -m "0.3m" $ hg update -C 3
cd .. 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
for i in 0 1 2 3 4 5 6 7 8; do $ hg mv afile anotherfile
mkdir test-"$i" $ hg commit -m "0.3m"
hg --cwd test-"$i" init $ cd ..
hg -R test push -r "$i" test-"$i" $ for i in 0 1 2 3 4 5 6 7 8; do
cd test-"$i" > mkdir test-"$i"
hg verify > hg --cwd test-"$i" init
cd .. > hg -R test push -r "$i" test-"$i"
done > cd test-"$i"
cd test-8 > hg verify
hg pull ../test-7 > cd ..
hg verify > 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment