Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-bundle-r.out @ 3283:d89e98840b08
add -r/--rev and --base option to bundle
--rev is used to specify a target rev (like pull or clone)
--base REV is used to specify a base instead of a target repo
the target repo is assumed to have all the rev specified in --base
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Thu, 20 Jul 2006 19:25:11 +0200 |
parents | |
children | a225055b3b59 |
comparison
equal
deleted
inserted
replaced
3282:f49c90b46897 | 3283:d89e98840b08 |
---|---|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
3 rev offset length base linkrev nodeid p1 p2 | |
4 0 0 3 0 0 362fef284ce2 000000000000 000000000000 | |
5 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 | |
6 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 | |
7 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 | |
8 rev offset length base linkrev nodeid p1 p2 | |
9 0 0 75 0 7 905359268f77 000000000000 000000000000 | |
10 rev offset length base linkrev nodeid p1 p2 | |
11 0 0 75 0 8 905359268f77 000000000000 000000000000 | |
12 rev offset length base linkrev nodeid p1 p2 | |
13 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 | |
14 rev offset length base linkrev nodeid p1 p2 | |
15 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 | |
16 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 | |
17 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 | |
18 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 | |
19 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 | |
20 5 250 68 3 7 3b45cc2ab868 de68e904d169 000000000000 | |
21 6 318 54 6 8 24d86153a002 f54c32f13478 000000000000 | |
22 checking changesets | |
23 checking manifests | |
24 crosschecking files in changesets and manifests | |
25 checking files | |
26 4 files, 9 changesets, 7 total revisions | |
27 searching for changes | |
28 adding changesets | |
29 adding manifests | |
30 adding file changes | |
31 added 1 changesets with 1 changes to 1 files | |
32 (run 'hg update' to get a working copy) | |
33 checking changesets | |
34 checking manifests | |
35 crosschecking files in changesets and manifests | |
36 checking files | |
37 1 files, 1 changesets, 1 total revisions | |
38 0:5649c9d34dd8 | |
39 searching for changes | |
40 adding changesets | |
41 adding manifests | |
42 adding file changes | |
43 added 2 changesets with 2 changes to 1 files | |
44 (run 'hg update' to get a working copy) | |
45 checking changesets | |
46 checking manifests | |
47 crosschecking files in changesets and manifests | |
48 checking files | |
49 1 files, 2 changesets, 2 total revisions | |
50 1:10b2180f755b | |
51 searching for changes | |
52 adding changesets | |
53 adding manifests | |
54 adding file changes | |
55 added 3 changesets with 3 changes to 1 files | |
56 (run 'hg update' to get a working copy) | |
57 checking changesets | |
58 checking manifests | |
59 crosschecking files in changesets and manifests | |
60 checking files | |
61 1 files, 3 changesets, 3 total revisions | |
62 2:d62976ca1e50 | |
63 searching for changes | |
64 adding changesets | |
65 adding manifests | |
66 adding file changes | |
67 added 4 changesets with 4 changes to 1 files | |
68 (run 'hg update' to get a working copy) | |
69 checking changesets | |
70 checking manifests | |
71 crosschecking files in changesets and manifests | |
72 checking files | |
73 1 files, 4 changesets, 4 total revisions | |
74 3:ac69c658229d | |
75 searching for changes | |
76 adding changesets | |
77 adding manifests | |
78 adding file changes | |
79 added 2 changesets with 2 changes to 1 files | |
80 (run 'hg update' to get a working copy) | |
81 checking changesets | |
82 checking manifests | |
83 crosschecking files in changesets and manifests | |
84 checking files | |
85 1 files, 2 changesets, 2 total revisions | |
86 1:5f4f3ceb285e | |
87 searching for changes | |
88 adding changesets | |
89 adding manifests | |
90 adding file changes | |
91 added 3 changesets with 3 changes to 1 files | |
92 (run 'hg update' to get a working copy) | |
93 checking changesets | |
94 checking manifests | |
95 crosschecking files in changesets and manifests | |
96 checking files | |
97 1 files, 3 changesets, 3 total revisions | |
98 2:024e4e7df376 | |
99 searching for changes | |
100 adding changesets | |
101 adding manifests | |
102 adding file changes | |
103 added 4 changesets with 5 changes to 2 files | |
104 (run 'hg update' to get a working copy) | |
105 checking changesets | |
106 checking manifests | |
107 crosschecking files in changesets and manifests | |
108 checking files | |
109 2 files, 4 changesets, 5 total revisions | |
110 3:1e3f6b843bd6 | |
111 searching for changes | |
112 adding changesets | |
113 adding manifests | |
114 adding file changes | |
115 added 5 changesets with 6 changes to 3 files | |
116 (run 'hg update' to get a working copy) | |
117 checking changesets | |
118 checking manifests | |
119 crosschecking files in changesets and manifests | |
120 checking files | |
121 3 files, 5 changesets, 6 total revisions | |
122 4:80fe151401c2 | |
123 searching for changes | |
124 adding changesets | |
125 adding manifests | |
126 adding file changes | |
127 added 5 changesets with 5 changes to 2 files | |
128 (run 'hg update' to get a working copy) | |
129 checking changesets | |
130 checking manifests | |
131 crosschecking files in changesets and manifests | |
132 checking files | |
133 2 files, 5 changesets, 5 total revisions | |
134 4:836ac62537ab | |
135 pulling from ../test-7 | |
136 searching for changes | |
137 adding changesets | |
138 adding manifests | |
139 adding file changes | |
140 added 4 changesets with 2 changes to 3 files (+1 heads) | |
141 (run 'hg heads' to see heads, 'hg merge' to merge) | |
142 checking changesets | |
143 checking manifests | |
144 crosschecking files in changesets and manifests | |
145 checking files | |
146 4 files, 9 changesets, 7 total revisions | |
147 rolling back last transaction | |
148 % should fail | |
149 abort: --base is incompatible with specifiying a destination | |
150 abort: repository default-push not found! | |
151 % 2 | |
152 2:d62976ca1e50 | |
153 adding changesets | |
154 abort: unknown parent ac69c658229d! | |
155 transaction abort! | |
156 rollback completed | |
157 % 2 | |
158 2:d62976ca1e50 | |
159 adding changesets | |
160 adding manifests | |
161 adding file changes | |
162 added 6 changesets with 4 changes to 4 files (+1 heads) | |
163 (run 'hg heads' to see heads, 'hg merge' to merge) | |
164 % 8 | |
165 8:836ac62537ab | |
166 rolling back last transaction | |
167 % 2 | |
168 2:d62976ca1e50 | |
169 adding changesets | |
170 adding manifests | |
171 adding file changes | |
172 added 2 changesets with 2 changes to 2 files | |
173 (run 'hg update' to get a working copy) | |
174 % 4 | |
175 4:836ac62537ab | |
176 adding changesets | |
177 adding manifests | |
178 adding file changes | |
179 added 4 changesets with 2 changes to 3 files (+1 heads) | |
180 (run 'hg heads' to see heads, 'hg merge' to merge) | |
181 % 8 | |
182 8:80fe151401c2 | |
183 checking changesets | |
184 checking manifests | |
185 crosschecking files in changesets and manifests | |
186 checking files | |
187 4 files, 9 changesets, 7 total revisions |