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