##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

largefiles: restore standins according to restored dirstate...
largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.
Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default
r22285:85bded43 default
Show More
test-ssh-clone-r.t
195 lines | 6.0 KiB | text/troff | Tads3Lexer
/ tests / test-ssh-clone-r.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
tests: unify test-ssh-clone-r
 r12490 This test tries to exercise the ssh functionality with a dummy script
Mads Kiilerich
tests: share dummyssh
 r14186 creating 'remote' repo
Matt Mackall
tests: unify test-ssh-clone-r
 r12490
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
 r14117 $ hg init remote
$ cd remote
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
 r16350 $ hg unbundle "$TESTDIR/bundles/remote.hg"
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
 r14117 adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
Matt Mackall
tests: unify test-ssh-clone-r
 r12490 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
clone remote via stream
$ for i in 0 1 2 3 4 5 6 7 8; do
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
 r16541 > hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed -r "$i" ssh://user@dummy/remote test-"$i"
Matt Mackall
tests: unify test-ssh-clone-r
 r12490 > if cd test-"$i"; then
> hg verify
> cd ..
> fi
> done
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 4 changesets, 4 total revisions
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
adding changesets
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 4 changesets, 5 total revisions
adding changesets
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
3 files, 5 changesets, 6 total revisions
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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
$ cd ..
$ cd test-1
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
 r16541 $ hg pull -e "python \"$TESTDIR/dummyssh\"" -r 4 ssh://user@dummy/remote
Matt Mackall
tests: unify test-ssh-clone-r
 r12490 pulling from ssh://user@dummy/remote
searching for changes
adding changesets
adding manifests
adding file changes
Peter Arrenbrecht
discovery: avoid discovery when local graph is a subset of remote...
 r13742 added 1 changesets with 0 changes to 0 files (+1 heads)
Matt Mackall
tests: unify test-ssh-clone-r
 r12490 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 2 total revisions
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
 r16541 $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
Matt Mackall
tests: unify test-ssh-clone-r
 r12490 pulling from ssh://user@dummy/remote
searching for changes
adding changesets
adding manifests
adding file changes
added 6 changesets with 5 changes to 4 files
(run 'hg update' to get a working copy)
$ cd ..
$ cd test-2
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
 r16541 $ hg pull -e "python \"$TESTDIR/dummyssh\"" -r 5 ssh://user@dummy/remote
Matt Mackall
tests: unify test-ssh-clone-r
 r12490 pulling from ssh://user@dummy/remote
searching for changes
adding changesets
adding manifests
adding file changes
Peter Arrenbrecht
discovery: avoid discovery when local graph is a subset of remote...
 r13742 added 2 changesets with 0 changes to 0 files (+1 heads)
Matt Mackall
tests: unify test-ssh-clone-r
 r12490 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 5 changesets, 3 total revisions
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
 r16541 $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
Matt Mackall
tests: unify test-ssh-clone-r
 r12490 pulling from ssh://user@dummy/remote
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
(run 'hg update' to get a working copy)
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913
$ cd ..