|
|
$ hg init test
|
|
|
$ cd test
|
|
|
$ hg unbundle "$TESTDIR/bundles/remote.hg"
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 9 changesets with 7 changes to 4 files (+1 heads)
|
|
|
new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
$ hg up tip
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
$ 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 bundle -r "$i" test-"$i".hg test-"$i"
|
|
|
> cd test-"$i"
|
|
|
> hg unbundle ../test-"$i".hg
|
|
|
> hg verify -q
|
|
|
> hg tip -q
|
|
|
> cd ..
|
|
|
> done
|
|
|
searching for changes
|
|
|
1 changesets found
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
new changesets bfaf4b5cbf01 (1 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
0:bfaf4b5cbf01
|
|
|
searching for changes
|
|
|
2 changesets found
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 2 changesets with 2 changes to 1 files
|
|
|
new changesets bfaf4b5cbf01:21f32785131f (2 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
1:21f32785131f
|
|
|
searching for changes
|
|
|
3 changesets found
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 3 changesets with 3 changes to 1 files
|
|
|
new changesets bfaf4b5cbf01:4ce51a113780 (3 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
2:4ce51a113780
|
|
|
searching for changes
|
|
|
4 changesets found
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 4 changesets with 4 changes to 1 files
|
|
|
new changesets bfaf4b5cbf01:93ee6ab32777 (4 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
3:93ee6ab32777
|
|
|
searching for changes
|
|
|
2 changesets found
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 2 changesets with 2 changes to 1 files
|
|
|
new changesets bfaf4b5cbf01:c70afb1ee985 (2 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
1:c70afb1ee985
|
|
|
searching for changes
|
|
|
3 changesets found
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 3 changesets with 3 changes to 1 files
|
|
|
new changesets bfaf4b5cbf01:f03ae5a9b979 (3 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
2:f03ae5a9b979
|
|
|
searching for changes
|
|
|
4 changesets found
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 4 changesets with 5 changes to 2 files
|
|
|
new changesets bfaf4b5cbf01:095cb14b1b4d (4 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
3:095cb14b1b4d
|
|
|
searching for changes
|
|
|
5 changesets found
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 5 changesets with 6 changes to 3 files
|
|
|
new changesets bfaf4b5cbf01:faa2e4234c7a (5 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
4:faa2e4234c7a
|
|
|
searching for changes
|
|
|
5 changesets found
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 5 changesets with 5 changes to 2 files
|
|
|
new changesets bfaf4b5cbf01:916f1afdef90 (5 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
4:916f1afdef90
|
|
|
$ 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)
|
|
|
new changesets c70afb1ee985:faa2e4234c7a
|
|
|
1 local changesets published
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
$ hg verify -q
|
|
|
$ hg rollback
|
|
|
repository tip rolled back to revision 4 (undo pull)
|
|
|
$ cd ..
|
|
|
|
|
|
should fail
|
|
|
|
|
|
$ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3
|
|
|
abort: --base is incompatible with specifying destinations
|
|
|
[10]
|
|
|
$ hg -R test bundle -a -r tip test-bundle-branch1.hg test-3
|
|
|
abort: --all is incompatible with specifying destinations
|
|
|
[10]
|
|
|
$ hg -R test bundle -r tip test-bundle-branch1.hg
|
|
|
config error: default repository not configured!
|
|
|
(see 'hg help config.paths')
|
|
|
[30]
|
|
|
|
|
|
$ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
|
|
|
2 changesets found
|
|
|
$ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
|
|
|
4 changesets found
|
|
|
$ hg -R test bundle --base 2 test-bundle-all.hg
|
|
|
6 changesets found
|
|
|
$ hg -R test bundle --base 2 --all test-bundle-all-2.hg
|
|
|
ignoring --base because --all was specified
|
|
|
9 changesets found
|
|
|
$ hg -R test bundle --base 3-3 -r tip test-base-match-nothing-with-dest.hg --config paths.default=$TESTTMP/test-3
|
|
|
5 changesets found
|
|
|
$ hg -R test bundle --base 3-3 -r tip test-base-match-nothing-no-dest.hg
|
|
|
5 changesets found
|
|
|
$ hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg
|
|
|
1 changesets found
|
|
|
|
|
|
empty bundle
|
|
|
|
|
|
$ hg -R test bundle --base 7 --base 8 test-bundle-empty.hg
|
|
|
no changes found
|
|
|
[1]
|
|
|
|
|
|
issue76 msg2163
|
|
|
|
|
|
$ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg
|
|
|
no changes found
|
|
|
[1]
|
|
|
|
|
|
Issue1910: 'hg bundle --base $head' does not exclude $head from
|
|
|
result
|
|
|
|
|
|
$ hg -R test bundle --base 7 test-bundle-cset-7.hg
|
|
|
4 changesets found
|
|
|
|
|
|
$ hg clone test-2 test-9
|
|
|
updating to branch default
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
$ cd test-9
|
|
|
|
|
|
revision 2
|
|
|
|
|
|
$ hg tip -q
|
|
|
2:4ce51a113780
|
|
|
$ hg unbundle ../test-bundle-should-fail.hg
|
|
|
adding changesets
|
|
|
transaction abort!
|
|
|
rollback completed
|
|
|
abort: 00changelog@93ee6ab32777cd430e07da694794fb6a4f917712: unknown parent
|
|
|
[50]
|
|
|
|
|
|
revision 2
|
|
|
|
|
|
$ hg tip -q
|
|
|
2:4ce51a113780
|
|
|
$ hg unbundle ../test-bundle-all.hg
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 6 changesets with 4 changes to 4 files (+1 heads)
|
|
|
new changesets 93ee6ab32777:916f1afdef90 (6 drafts)
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
|
|
revision 8
|
|
|
|
|
|
$ hg tip -q
|
|
|
8:916f1afdef90
|
|
|
$ hg verify -q
|
|
|
$ hg rollback
|
|
|
repository tip rolled back to revision 2 (undo unbundle)
|
|
|
|
|
|
revision 2
|
|
|
|
|
|
$ hg tip -q
|
|
|
2:4ce51a113780
|
|
|
$ hg unbundle ../test-bundle-branch1.hg
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 2 changesets with 2 changes to 2 files
|
|
|
new changesets 93ee6ab32777:916f1afdef90 (2 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
|
|
revision 4
|
|
|
|
|
|
$ hg tip -q
|
|
|
4:916f1afdef90
|
|
|
$ hg verify -q
|
|
|
$ hg rollback
|
|
|
repository tip rolled back to revision 2 (undo unbundle)
|
|
|
$ hg unbundle ../test-bundle-branch2.hg
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 4 changesets with 3 changes to 3 files (+1 heads)
|
|
|
new changesets c70afb1ee985:faa2e4234c7a (4 drafts)
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
|
|
revision 6
|
|
|
|
|
|
$ hg tip -q
|
|
|
6:faa2e4234c7a
|
|
|
$ hg verify -q
|
|
|
$ hg rollback
|
|
|
repository tip rolled back to revision 2 (undo unbundle)
|
|
|
$ hg unbundle ../test-bundle-cset-7.hg
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 2 changesets with 2 changes to 2 files
|
|
|
new changesets 93ee6ab32777:916f1afdef90 (2 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
|
|
revision 4
|
|
|
|
|
|
$ hg tip -q
|
|
|
4:916f1afdef90
|
|
|
$ hg verify -q
|
|
|
|
|
|
$ cd ../test
|
|
|
$ hg merge 7
|
|
|
note: possible conflict - afile was renamed multiple times to:
|
|
|
adifferentfile
|
|
|
anotherfile
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
(branch merge, don't forget to commit)
|
|
|
$ hg ci -m merge
|
|
|
$ cd ..
|
|
|
$ hg -R test bundle --base 2 test-bundle-head.hg
|
|
|
7 changesets found
|
|
|
$ hg clone test-2 test-10
|
|
|
updating to branch default
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
$ cd test-10
|
|
|
$ hg unbundle ../test-bundle-head.hg
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 7 changesets with 4 changes to 4 files
|
|
|
new changesets 93ee6ab32777:03fc0b0e347c (7 drafts)
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
|
|
revision 9
|
|
|
|
|
|
$ hg tip -q
|
|
|
9:03fc0b0e347c
|
|
|
$ hg verify -q
|
|
|
|
|
|
$ cd ..
|
|
|
|
