Mercurial > hg

annotate tests/test-bundle-r.t @ 15019:f4b7be3f8430 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dispatch: don't rewrap aliases that have the same definition Previously aliases that overrode existing commands would wrap the old alias on every call to dispatch() (twice actually), which is an obvious re-entrancy issue for things like the command server or TortoiseHG.
author Idan Kamara <idankk86@gmail.com>
date Thu, 04 Aug 2011 19:41:23 +0300
parents f45c8db21749
children 7c26ce9edbd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
1 $ hg init test
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
2 $ cd test
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
3 $ hg unbundle $TESTDIR/bundles/remote.hg
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
4 adding changesets
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
5 adding manifests
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
6 adding file changes
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
7 added 9 changesets with 7 changes to 4 files (+1 heads)
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
8 (run 'hg heads' to see heads, 'hg merge' to merge)
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
9 $ hg up tip
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
11 $ cd ..
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
12
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
13 $ for i in 0 1 2 3 4 5 6 7 8; do
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
14 > mkdir test-"$i"
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
15 > hg --cwd test-"$i" init
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
16 > hg -R test bundle -r "$i" test-"$i".hg test-"$i"
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
17 > cd test-"$i"
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
18 > hg unbundle ../test-"$i".hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
19 > hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
20 > hg tip -q
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
21 > cd ..
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
22 > done
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
23 searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
24 1 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
25 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
26 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
27 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
28 added 1 changesets with 1 changes to 1 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
29 (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
30 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
31 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
32 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
33 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
34 1 files, 1 changesets, 1 total revisions
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
35 0:bfaf4b5cbf01
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
36 searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
37 2 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
38 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
39 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
40 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
41 added 2 changesets with 2 changes to 1 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
42 (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
43 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
44 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
45 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
46 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
47 1 files, 2 changesets, 2 total revisions
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
48 1:21f32785131f
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
49 searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
50 3 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
51 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
52 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
53 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
54 added 3 changesets with 3 changes to 1 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
55 (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
56 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
57 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
58 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
59 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
60 1 files, 3 changesets, 3 total revisions
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
61 2:4ce51a113780
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
62 searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
63 4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
64 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
65 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
66 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
67 added 4 changesets with 4 changes to 1 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
68 (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
69 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
70 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
71 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
72 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
73 1 files, 4 changesets, 4 total revisions
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
74 3:93ee6ab32777
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
75 searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
76 2 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
77 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
78 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
79 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
80 added 2 changesets with 2 changes to 1 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
81 (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
82 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
83 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
84 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
85 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
86 1 files, 2 changesets, 2 total revisions
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
87 1:c70afb1ee985
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
88 searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
89 3 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
90 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
91 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
92 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
93 added 3 changesets with 3 changes to 1 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
94 (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
95 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
96 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
97 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
98 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
99 1 files, 3 changesets, 3 total revisions
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
100 2:f03ae5a9b979
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
101 searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
102 4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
103 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
104 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
105 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
106 added 4 changesets with 5 changes to 2 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
107 (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
108 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
109 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
110 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
111 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
112 2 files, 4 changesets, 5 total revisions
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
113 3:095cb14b1b4d
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
114 searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
115 5 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
116 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
117 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
118 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
119 added 5 changesets with 6 changes to 3 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
120 (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
121 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
122 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
123 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
124 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
125 3 files, 5 changesets, 6 total revisions
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
126 4:faa2e4234c7a
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
127 searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
128 5 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
129 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
130 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
131 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
132 added 5 changesets with 5 changes to 2 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
133 (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
134 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
135 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
136 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
137 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
138 2 files, 5 changesets, 5 total revisions
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
139 4:916f1afdef90
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
140 $ cd test-8
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
141 $ hg pull ../test-7
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
142 pulling from ../test-7
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
143 searching for changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
144 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
145 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
146 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
147 added 4 changesets with 2 changes to 3 files (+1 heads)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
148 (run 'hg heads' to see heads, 'hg merge' to merge)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
149 $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
150 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
151 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
152 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
153 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
154 4 files, 9 changesets, 7 total revisions
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
155 $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
156 repository tip rolled back to revision 4 (undo pull)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
157 working directory now based on revision -1
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
158 $ cd ..
3284
d89e98840b08 add -r/--rev and --base option to bundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
159
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
160 should fail
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
161
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
162 $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
163 abort: --base is incompatible with specifying a destination
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
164 [255]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
165 $ hg -R test bundle -r tip test-bundle-branch1.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
166 abort: repository default-push not found!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
167 [255]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
168
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
169 $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
170 2 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
171 $ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
172 4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
173 $ hg -R test bundle --base 2 test-bundle-all.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
174 6 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
175 $ hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
176 1 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
177
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
178 empty bundle
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
179
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
180 $ hg -R test bundle --base 7 --base 8 test-bundle-empty.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
181 no changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
182 [1]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
183
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
184 issue76 msg2163
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
185
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
186 $ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg
14073
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13446
diff changeset
187 no changes found
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13446
diff changeset
188 [1]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
189
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12316
diff changeset
190 Issue1910: 'hg bundle --base $head' does not exclude $head from
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12316
diff changeset
191 result
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
192
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
193 $ hg -R test bundle --base 7 test-bundle-cset-7.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
194 4 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
195
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
196 $ hg clone test-2 test-9
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
197 updating to branch default
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
198 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
199 $ cd test-9
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
200
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
201 revision 2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
202
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
203 $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
204 2:4ce51a113780
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
205 $ hg unbundle ../test-bundle-should-fail.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
206 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
207 transaction abort!
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
208 rollback completed
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
209 abort: 00changelog.i@93ee6ab32777: unknown parent!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
210 [255]
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
211
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
212 revision 2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
213
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
214 $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
215 2:4ce51a113780
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
216 $ hg unbundle ../test-bundle-all.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
217 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
218 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
219 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
220 added 6 changesets with 4 changes to 4 files (+1 heads)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
221 (run 'hg heads' to see heads, 'hg merge' to merge)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
222
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
223 revision 8
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
224
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
225 $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
226 8:916f1afdef90
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
227 $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
228 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
229 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
230 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
231 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
232 4 files, 9 changesets, 7 total revisions
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
233 $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
234 repository tip rolled back to revision 2 (undo unbundle)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
235 working directory now based on revision 2
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
236
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
237 revision 2
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
238
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
239 $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
240 2:4ce51a113780
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
241 $ hg unbundle ../test-bundle-branch1.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
242 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
243 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
244 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
245 added 2 changesets with 2 changes to 2 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
246 (run 'hg update' to get a working copy)
3284
d89e98840b08 add -r/--rev and --base option to bundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
247
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
248 revision 4
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
249
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
250 $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
251 4:916f1afdef90
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
252 $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
253 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
254 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
255 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
256 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
257 2 files, 5 changesets, 5 total revisions
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
258 $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
259 repository tip rolled back to revision 2 (undo unbundle)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
260 working directory now based on revision 2
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
261 $ hg unbundle ../test-bundle-branch2.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
262 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
263 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
264 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
265 added 4 changesets with 3 changes to 3 files (+1 heads)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
266 (run 'hg heads' to see heads, 'hg merge' to merge)
3284
d89e98840b08 add -r/--rev and --base option to bundle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
267
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
268 revision 6
3360
ef8307585b41 nodesbetween: fix a bug with duplicate heads
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3318
diff changeset
269
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
270 $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
271 6:faa2e4234c7a
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
272 $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
273 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
274 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
275 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
276 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
277 3 files, 7 changesets, 6 total revisions
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
278 $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
279 repository tip rolled back to revision 2 (undo unbundle)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12757
diff changeset
280 working directory now based on revision 2
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
281 $ hg unbundle ../test-bundle-cset-7.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
282 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
283 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
284 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
285 added 2 changesets with 2 changes to 2 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
286 (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
287
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
288 revision 4
3360
ef8307585b41 nodesbetween: fix a bug with duplicate heads
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3318
diff changeset
289
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
290 $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
291 4:916f1afdef90
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
292 $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
293 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
294 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
295 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
296 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
297 2 files, 5 changesets, 5 total revisions
3318
a225055b3b59 bundle --base: use the right set for the base
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3285
diff changeset
298
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
299 $ cd ../test
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
300 $ hg merge 7
12757
62c8f7691bc3 merge: make 'diverging renames' diagnostic a more helpful note.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12399
diff changeset
301 note: possible conflict - afile was renamed multiple times to:
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
302 anotherfile
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
303 adifferentfile
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
304 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
305 (branch merge, don't forget to commit)
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11871
diff changeset
306 $ hg ci -m merge
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
307 $ cd ..
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
308 $ hg -R test bundle --base 2 test-bundle-head.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
309 7 changesets found
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
310 $ hg clone test-2 test-10
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
311 updating to branch default
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
312 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
313 $ cd test-10
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
314 $ hg unbundle ../test-bundle-head.hg
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
315 adding changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
316 adding manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
317 adding file changes
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
318 added 7 changesets with 4 changes to 4 files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
319 (run 'hg update' to get a working copy)
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
320
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
321 revision 9
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
322
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
323 $ hg tip -q
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 13446
diff changeset
324 9:03fc0b0e347c
11871
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
325 $ hg verify
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
326 checking changesets
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
327 checking manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
328 crosschecking files in changesets and manifests
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
329 checking files
f22b101e33e4 tests: unify test-bundle-r
Martin Geisler <mg@lazybytes.net>
parents: 10616
diff changeset
330 4 files, 10 changesets, 7 total revisions