Mercurial > hg
annotate tests/test-bundle.t @ 12520:873ca83d6cfd
tests: unify test-convert-cvs-branch
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 26 Sep 2010 15:33:09 -0500 |
parents | 4134686b83e1 |
children | b00eda50ad2b |
rev | line source |
---|---|
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
1 $ cp "$TESTDIR"/printenv.py . |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
3 Setting up test |
2274
89b15372df18
tests for bundles and bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
4 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
5 $ hg init test |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
6 $ cd test |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
7 $ echo 0 > afile |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
8 $ hg add afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
9 $ hg commit -m "0.0" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
10 $ echo 1 >> afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
11 $ hg commit -m "0.1" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
12 $ echo 2 >> afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
13 $ hg commit -m "0.2" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
14 $ echo 3 >> afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
15 $ hg commit -m "0.3" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
16 $ hg update -C 0 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
18 $ echo 1 >> afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
19 $ hg commit -m "1.1" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
20 created new head |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
21 $ echo 2 >> afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
22 $ hg commit -m "1.2" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
23 $ echo "a line" > fred |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
24 $ echo 3 >> afile |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
25 $ hg add fred |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
26 $ hg commit -m "1.3" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
27 $ hg mv afile adifferentfile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
28 $ hg commit -m "1.3m" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
29 $ hg update -C 3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
30 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
31 $ hg mv afile anotherfile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
32 $ hg commit -m "0.3m" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
33 $ hg verify |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
34 checking changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
35 checking manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
36 crosschecking files in changesets and manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
37 checking files |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
38 4 files, 9 changesets, 7 total revisions |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
39 $ cd .. |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
40 $ hg init empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
41 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
42 Bundle --all |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
43 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
44 $ hg -R test bundle --all all.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
45 9 changesets found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
46 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
47 Bundle test to full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
48 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
49 $ hg -R test bundle full.hg empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
50 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
51 9 changesets found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
52 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
53 Unbundle full.hg in test |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
54 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
55 $ hg -R test unbundle full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
56 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
57 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
58 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
59 added 0 changesets with 0 changes to 4 files |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
60 (run 'hg update' to get a working copy) |
4287
ce71da8ab4f5
test-bundle: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4042
diff
changeset
|
61 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
62 Verify empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
63 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
64 $ hg -R empty heads |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
65 [1] |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
66 $ hg -R empty verify |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
67 checking changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
68 checking manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
69 crosschecking files in changesets and manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
70 checking files |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
71 0 files, 0 changesets, 0 total revisions |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
72 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
73 Pull full.hg into test (using --cwd) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
74 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
75 $ hg --cwd test pull ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
76 pulling from ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
77 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
78 no changes found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
79 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
80 Pull full.hg into empty (using --cwd) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
81 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
82 $ hg --cwd empty pull ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
83 pulling from ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
84 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
85 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
86 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
87 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
88 added 9 changesets with 7 changes to 4 files (+1 heads) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
89 (run 'hg heads' to see heads, 'hg merge' to merge) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
90 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
91 Rollback empty |
5663
99fdef2e6793
Add output markers to test-bundle so it's easier to spot the source of
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
4699
diff
changeset
|
92 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
93 $ hg -R empty rollback |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
94 rolling back to revision -1 (undo pull) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
95 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
96 Pull full.hg into empty again (using --cwd) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
97 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
98 $ hg --cwd empty pull ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
99 pulling from ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
100 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
101 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
102 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
103 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
104 added 9 changesets with 7 changes to 4 files (+1 heads) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
105 (run 'hg heads' to see heads, 'hg merge' to merge) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
106 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
107 Pull full.hg into test (using -R) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
108 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
109 $ hg -R test pull full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
110 pulling from full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
111 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
112 no changes found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
113 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
114 Pull full.hg into empty (using -R) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
115 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
116 $ hg -R empty pull full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
117 pulling from full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
118 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
119 no changes found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
120 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
121 Rollback empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
122 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
123 $ hg -R empty rollback |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
124 rolling back to revision -1 (undo pull) |
7853
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7141
diff
changeset
|
125 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
126 Pull full.hg into empty again (using -R) |
2274
89b15372df18
tests for bundles and bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
127 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
128 $ hg -R empty pull full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
129 pulling from full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
130 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
131 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
132 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
133 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
134 added 9 changesets with 7 changes to 4 files (+1 heads) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
135 (run 'hg heads' to see heads, 'hg merge' to merge) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
136 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
137 Log -R full.hg in fresh empty |
2738
400a4a502001
pull: allow to pull from bundle file without need for bundle: syntax
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2673
diff
changeset
|
138 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
139 $ rm -r empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
140 $ hg init empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
141 $ cd empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
142 $ hg -R bundle://../full.hg log |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
143 changeset: 8:aa35859c02ea |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
144 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
145 parent: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
146 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
147 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
148 summary: 0.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
149 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
150 changeset: 7:a6a34bfa0076 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
151 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
152 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
153 summary: 1.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
154 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
155 changeset: 6:7373c1169842 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
156 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
157 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
158 summary: 1.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
159 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
160 changeset: 5:1bb50a9436a7 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
161 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
162 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
163 summary: 1.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
164 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
165 changeset: 4:095197eb4973 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
166 parent: 0:f9ee2f85a263 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
167 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
168 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
169 summary: 1.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
170 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
171 changeset: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
172 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
173 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
174 summary: 0.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
175 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
176 changeset: 2:e38ba6f5b7e0 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
177 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
178 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
179 summary: 0.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
180 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
181 changeset: 1:34c2bf6b0626 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
182 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
183 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
184 summary: 0.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
185 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
186 changeset: 0:f9ee2f85a263 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
187 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
188 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
189 summary: 0.0 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
190 |
5664
da72b4d24797
Fix income/pull with bundle and -R (issue 820).
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
5663
diff
changeset
|
191 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
192 Pull ../full.hg into empty (with hook) |
5663
99fdef2e6793
Add output markers to test-bundle so it's easier to spot the source of
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
4699
diff
changeset
|
193 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
194 $ echo '[hooks]' >> .hg/hgrc |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
195 $ echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
196 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
197 doesn't work (yet ?) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
198 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
199 hg -R bundle://../full.hg verify |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
200 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
201 $ hg pull bundle://../full.hg |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
202 changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:../full.hg |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
203 pulling from bundle://../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
204 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
205 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
206 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
207 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
208 added 9 changesets with 7 changes to 4 files (+1 heads) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
209 (run 'hg heads' to see heads, 'hg merge' to merge) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
210 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
211 Rollback empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
212 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
213 $ hg rollback |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
214 rolling back to revision -1 (undo pull) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
215 $ cd .. |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
216 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
217 Log -R bundle:empty+full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
218 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
219 $ hg -R bundle:empty+full.hg log --template="{rev} "; echo "" |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
220 8 7 6 5 4 3 2 1 0 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
221 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
222 Pull full.hg into empty again (using -R; with hook) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
223 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
224 $ hg -R empty pull full.hg |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
225 changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:empty+full.hg |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
226 pulling from full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
227 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
228 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
229 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
230 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
231 added 9 changesets with 7 changes to 4 files (+1 heads) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
232 (run 'hg heads' to see heads, 'hg merge' to merge) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
233 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
234 Create partial clones |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
235 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
236 $ rm -r empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
237 $ hg init empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
238 $ hg clone -r 3 test partial |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
239 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
240 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
241 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
242 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
243 added 4 changesets with 4 changes to 1 files |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
244 updating to branch default |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
245 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
246 $ hg clone partial partial2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
247 updating to branch default |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
248 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
249 $ cd partial |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
250 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
251 Log -R full.hg in partial |
2274
89b15372df18
tests for bundles and bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
252 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
253 $ hg -R bundle://../full.hg log |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
254 changeset: 8:aa35859c02ea |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
255 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
256 parent: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
257 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
258 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
259 summary: 0.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
260 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
261 changeset: 7:a6a34bfa0076 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
262 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
263 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
264 summary: 1.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
265 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
266 changeset: 6:7373c1169842 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
267 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
268 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
269 summary: 1.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
270 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
271 changeset: 5:1bb50a9436a7 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
272 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
273 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
274 summary: 1.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
275 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
276 changeset: 4:095197eb4973 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
277 parent: 0:f9ee2f85a263 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
278 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
279 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
280 summary: 1.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
281 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
282 changeset: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
283 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
284 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
285 summary: 0.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
286 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
287 changeset: 2:e38ba6f5b7e0 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
288 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
289 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
290 summary: 0.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
291 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
292 changeset: 1:34c2bf6b0626 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
293 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
294 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
295 summary: 0.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
296 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
297 changeset: 0:f9ee2f85a263 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
298 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
299 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
300 summary: 0.0 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
301 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
302 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
303 Incoming full.hg in partial |
4042
f6f65a8d8ed3
add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3988
diff
changeset
|
304 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
305 $ hg incoming bundle://../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
306 comparing with bundle://../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
307 searching for changes |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
308 changeset: 4:095197eb4973 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
309 parent: 0:f9ee2f85a263 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
310 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
311 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
312 summary: 1.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
313 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
314 changeset: 5:1bb50a9436a7 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
315 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
316 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
317 summary: 1.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
318 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
319 changeset: 6:7373c1169842 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
320 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
321 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
322 summary: 1.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
323 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
324 changeset: 7:a6a34bfa0076 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
325 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
326 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
327 summary: 1.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
328 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
329 changeset: 8:aa35859c02ea |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
330 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
331 parent: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
332 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
333 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
334 summary: 0.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
335 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
336 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
337 Outgoing -R full.hg vs partial2 in partial |
6316
ad5baedeee02
Add tests for cloning from a all-history bundle
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
6171
diff
changeset
|
338 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
339 $ hg -R bundle://../full.hg outgoing ../partial2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
340 comparing with ../partial2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
341 searching for changes |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
342 changeset: 4:095197eb4973 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
343 parent: 0:f9ee2f85a263 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
344 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
345 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
346 summary: 1.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
347 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
348 changeset: 5:1bb50a9436a7 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
349 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
350 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
351 summary: 1.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
352 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
353 changeset: 6:7373c1169842 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
354 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
355 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
356 summary: 1.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
357 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
358 changeset: 7:a6a34bfa0076 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
359 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
360 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
361 summary: 1.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
362 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
363 changeset: 8:aa35859c02ea |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
364 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
365 parent: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
366 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
367 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
368 summary: 0.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
369 |
4699
a6b62584d0b2
unbundle: accept multiple file arguments
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
4287
diff
changeset
|
370 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
371 Outgoing -R does-not-exist.hg vs partial2 in partial |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
372 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
373 $ hg -R bundle://../does-not-exist.hg outgoing ../partial2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
374 abort: No such file or directory: ../does-not-exist.hg |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
375 [255] |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
376 $ cd .. |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
377 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
378 Direct clone from bundle (all-history) |
4042
f6f65a8d8ed3
add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3988
diff
changeset
|
379 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
380 $ hg clone full.hg full-clone |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
381 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
382 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
383 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
384 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
385 added 9 changesets with 7 changes to 4 files (+1 heads) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
386 updating to branch default |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
387 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
388 $ hg -R full-clone heads |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
389 changeset: 8:aa35859c02ea |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
390 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
391 parent: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
392 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
393 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
394 summary: 0.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
395 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
396 changeset: 7:a6a34bfa0076 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
397 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
398 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
399 summary: 1.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
400 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
401 $ rm -r full-clone |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
402 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
403 test for http://mercurial.selenic.com/bts/issue216 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
404 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
405 Unbundle incremental bundles into fresh empty in one go |
4042
f6f65a8d8ed3
add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3988
diff
changeset
|
406 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
407 $ rm -r empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
408 $ hg init empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
409 $ hg -R test bundle --base null -r 0 ../0.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
410 1 changesets found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
411 $ hg -R test bundle --base 0 -r 1 ../1.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
412 1 changesets found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
413 $ hg -R empty unbundle -u ../0.hg ../1.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
414 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
415 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
416 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
417 added 1 changesets with 1 changes to 1 files |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
418 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
419 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
420 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
421 added 1 changesets with 1 changes to 1 files |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
422 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4042
f6f65a8d8ed3
add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3988
diff
changeset
|
423 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
424 test for 540d1059c802 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
425 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
426 test for 540d1059c802 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
427 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
428 $ hg init orig |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
429 $ cd orig |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
430 $ echo foo > foo |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
431 $ hg add foo |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
432 $ hg ci -m 'add foo' |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
433 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
434 $ hg clone . ../copy |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
435 updating to branch default |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
436 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
437 $ hg tag foo |
7141
8d1bdaf842de
issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
6316
diff
changeset
|
438 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
439 $ cd ../copy |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
440 $ echo >> foo |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
441 $ hg ci -m 'change foo' |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
442 $ hg bundle ../bundle.hg ../orig |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
443 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
444 1 changesets found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
445 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
446 $ cd ../orig |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
447 $ hg incoming ../bundle.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
448 comparing with ../bundle.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
449 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
450 changeset: 2:ed1b79f46b9a |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
451 tag: tip |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
452 parent: 0:bbd179dfa0a7 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
453 user: test |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
454 date: Thu Jan 01 00:00:00 1970 +0000 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
455 summary: change foo |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
456 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
457 $ cd .. |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
458 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
459 test for http://mercurial.selenic.com/bts/issue1144 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
460 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
461 test that verify bundle does not traceback |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
462 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
463 partial history bundle, fails w/ unkown parent |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
464 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
465 $ hg -R bundle.hg verify |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
466 abort: 00changelog.i@bbd179dfa0a7: unknown parent! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
467 [255] |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
468 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
469 full history bundle, refuses to verify non-local repo |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
470 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
471 $ hg -R all.hg verify |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
472 abort: cannot verify bundle or remote repos |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
473 [255] |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
474 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
475 but, regular verify must continue to work |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
476 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
477 $ hg -R orig verify |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
478 checking changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
479 checking manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
480 crosschecking files in changesets and manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
481 checking files |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
482 2 files, 2 changesets, 2 total revisions |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
483 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
484 diff against bundle |
7141
8d1bdaf842de
issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
6316
diff
changeset
|
485 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
486 $ hg init b |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
487 $ cd b |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
488 $ hg -R ../all.hg diff -r tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
489 diff -r aa35859c02ea anotherfile |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
490 --- a/anotherfile Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
491 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
492 @@ -1,4 +0,0 @@ |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
493 -0 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
494 -1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
495 -2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
496 -3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
497 $ cd .. |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
498 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
499 bundle single branch |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
500 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
501 $ hg init branchy |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
502 $ cd branchy |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
503 $ echo a >a |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
504 $ hg ci -Ama |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
505 adding a |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
506 $ echo b >b |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
507 $ hg ci -Amb |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
508 adding b |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
509 $ echo b1 >b1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
510 $ hg ci -Amb1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
511 adding b1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
512 $ hg up 0 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
513 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
514 $ echo c >c |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
515 $ hg ci -Amc |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
516 adding c |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
517 created new head |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
518 $ echo c1 >c1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
519 $ hg ci -Amc1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
520 adding c1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
521 $ hg clone -q .#tip part |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
522 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
523 == bundling via incoming |
7141
8d1bdaf842de
issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
6316
diff
changeset
|
524 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
525 $ hg in -R part --bundle incoming.hg --template "{node}\n" . |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
526 comparing with . |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
527 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
528 d2ae7f538514cd87c17547b0de4cea71fe1af9fb |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
529 5ece8e77363e2b5269e27c66828b72da29e4341a |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
530 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
531 == bundling |
7853
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7141
diff
changeset
|
532 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
533 $ hg bundle bundle.hg part --debug |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
534 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
535 common changesets up to c0025332f9ed |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
536 2 changesets found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
537 list of changesets: |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
538 d2ae7f538514cd87c17547b0de4cea71fe1af9fb |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
539 5ece8e77363e2b5269e27c66828b72da29e4341a |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
540 bundling changes: 0 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
541 bundling changes: 1 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
542 bundling changes: 2 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
543 bundling changes: 3 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
544 bundling changes: 4 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
545 bundling changes: 5 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
546 bundling changes: 6 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
547 bundling manifests: 0 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
548 bundling manifests: 1 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
549 bundling manifests: 2 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
550 bundling manifests: 3 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
551 bundling manifests: 4 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
552 bundling manifests: 5 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
553 bundling manifests: 6 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
554 bundling files: b 0 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
555 bundling files: b 1 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
556 bundling files: b 2 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
557 bundling files: b 3 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
558 bundling files: b1 4 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
559 bundling files: b1 5 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
560 bundling files: b1 6 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
561 bundling files: b1 7 chunks |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
562 |