Show More
@@ -1,488 +1,489 b'' | |||||
1 | # bundlecaches.py - utility to deal with pre-computed bundle for servers |
|
1 | # bundlecaches.py - utility to deal with pre-computed bundle for servers | |
2 | # |
|
2 | # | |
3 | # This software may be used and distributed according to the terms of the |
|
3 | # This software may be used and distributed according to the terms of the | |
4 | # GNU General Public License version 2 or any later version. |
|
4 | # GNU General Public License version 2 or any later version. | |
5 |
|
5 | |||
6 | import collections |
|
6 | import collections | |
7 |
|
7 | |||
8 | from .i18n import _ |
|
8 | from .i18n import _ | |
9 |
|
9 | |||
10 | from .thirdparty import attr |
|
10 | from .thirdparty import attr | |
11 |
|
11 | |||
12 | from . import ( |
|
12 | from . import ( | |
13 | error, |
|
13 | error, | |
14 | requirements as requirementsmod, |
|
14 | requirements as requirementsmod, | |
15 | sslutil, |
|
15 | sslutil, | |
16 | util, |
|
16 | util, | |
17 | ) |
|
17 | ) | |
18 | from .utils import stringutil |
|
18 | from .utils import stringutil | |
19 |
|
19 | |||
20 | urlreq = util.urlreq |
|
20 | urlreq = util.urlreq | |
21 |
|
21 | |||
22 | CB_MANIFEST_FILE = b'clonebundles.manifest' |
|
22 | CB_MANIFEST_FILE = b'clonebundles.manifest' | |
23 |
|
23 | |||
24 |
|
24 | |||
25 | @attr.s |
|
25 | @attr.s | |
26 | class bundlespec: |
|
26 | class bundlespec: | |
27 | compression = attr.ib() |
|
27 | compression = attr.ib() | |
28 | wirecompression = attr.ib() |
|
28 | wirecompression = attr.ib() | |
29 | version = attr.ib() |
|
29 | version = attr.ib() | |
30 | wireversion = attr.ib() |
|
30 | wireversion = attr.ib() | |
31 | # parameters explicitly overwritten by the config or the specification |
|
31 | # parameters explicitly overwritten by the config or the specification | |
32 | _explicit_params = attr.ib() |
|
32 | _explicit_params = attr.ib() | |
33 | # default parameter for the version |
|
33 | # default parameter for the version | |
34 | # |
|
34 | # | |
35 | # Keeping it separated is useful to check what was actually overwritten. |
|
35 | # Keeping it separated is useful to check what was actually overwritten. | |
36 | _default_opts = attr.ib() |
|
36 | _default_opts = attr.ib() | |
37 |
|
37 | |||
38 | @property |
|
38 | @property | |
39 | def params(self): |
|
39 | def params(self): | |
40 | return collections.ChainMap(self._explicit_params, self._default_opts) |
|
40 | return collections.ChainMap(self._explicit_params, self._default_opts) | |
41 |
|
41 | |||
42 | @property |
|
42 | @property | |
43 | def contentopts(self): |
|
43 | def contentopts(self): | |
44 | # kept for Backward Compatibility concerns. |
|
44 | # kept for Backward Compatibility concerns. | |
45 | return self.params |
|
45 | return self.params | |
46 |
|
46 | |||
47 | def set_param(self, key, value, overwrite=True): |
|
47 | def set_param(self, key, value, overwrite=True): | |
48 | """Set a bundle parameter value. |
|
48 | """Set a bundle parameter value. | |
49 |
|
49 | |||
50 | Will only overwrite if overwrite is true""" |
|
50 | Will only overwrite if overwrite is true""" | |
51 | if overwrite or key not in self._explicit_params: |
|
51 | if overwrite or key not in self._explicit_params: | |
52 | self._explicit_params[key] = value |
|
52 | self._explicit_params[key] = value | |
53 |
|
53 | |||
54 |
|
54 | |||
55 | # Maps bundle version human names to changegroup versions. |
|
55 | # Maps bundle version human names to changegroup versions. | |
56 | _bundlespeccgversions = { |
|
56 | _bundlespeccgversions = { | |
57 | b'v1': b'01', |
|
57 | b'v1': b'01', | |
58 | b'v2': b'02', |
|
58 | b'v2': b'02', | |
59 | b'packed1': b's1', |
|
59 | b'packed1': b's1', | |
60 | b'bundle2': b'02', # legacy |
|
60 | b'bundle2': b'02', # legacy | |
61 | } |
|
61 | } | |
62 |
|
62 | |||
63 | # Maps bundle version with content opts to choose which part to bundle |
|
63 | # Maps bundle version with content opts to choose which part to bundle | |
64 | _bundlespeccontentopts = { |
|
64 | _bundlespeccontentopts = { | |
65 | b'v1': { |
|
65 | b'v1': { | |
66 | b'changegroup': True, |
|
66 | b'changegroup': True, | |
67 | b'cg.version': b'01', |
|
67 | b'cg.version': b'01', | |
68 | b'obsolescence': False, |
|
68 | b'obsolescence': False, | |
69 | b'phases': False, |
|
69 | b'phases': False, | |
70 | b'tagsfnodescache': False, |
|
70 | b'tagsfnodescache': False, | |
71 | b'revbranchcache': False, |
|
71 | b'revbranchcache': False, | |
72 | }, |
|
72 | }, | |
73 | b'v2': { |
|
73 | b'v2': { | |
74 | b'changegroup': True, |
|
74 | b'changegroup': True, | |
75 | b'cg.version': b'02', |
|
75 | b'cg.version': b'02', | |
76 | b'obsolescence': False, |
|
76 | b'obsolescence': False, | |
77 | b'phases': False, |
|
77 | b'phases': False, | |
78 | b'tagsfnodescache': True, |
|
78 | b'tagsfnodescache': True, | |
79 | b'revbranchcache': True, |
|
79 | b'revbranchcache': True, | |
80 | }, |
|
80 | }, | |
81 | b'streamv2': { |
|
81 | b'streamv2': { | |
82 | b'changegroup': False, |
|
82 | b'changegroup': False, | |
83 | b'cg.version': b'02', |
|
83 | b'cg.version': b'02', | |
84 | b'obsolescence': False, |
|
84 | b'obsolescence': False, | |
85 | b'phases': False, |
|
85 | b'phases': False, | |
86 | b"streamv2": True, |
|
86 | b"streamv2": True, | |
87 | b'tagsfnodescache': False, |
|
87 | b'tagsfnodescache': False, | |
88 | b'revbranchcache': False, |
|
88 | b'revbranchcache': False, | |
89 | }, |
|
89 | }, | |
90 | b'packed1': { |
|
90 | b'packed1': { | |
91 | b'cg.version': b's1', |
|
91 | b'cg.version': b's1', | |
92 | }, |
|
92 | }, | |
93 | b'bundle2': { # legacy |
|
93 | b'bundle2': { # legacy | |
94 | b'cg.version': b'02', |
|
94 | b'cg.version': b'02', | |
95 | }, |
|
95 | }, | |
96 | } |
|
96 | } | |
97 | _bundlespeccontentopts[b'bundle2'] = _bundlespeccontentopts[b'v2'] |
|
97 | _bundlespeccontentopts[b'bundle2'] = _bundlespeccontentopts[b'v2'] | |
98 |
|
98 | |||
99 | _bundlespecvariants = {b"streamv2": {}} |
|
99 | _bundlespecvariants = {b"streamv2": {}} | |
100 |
|
100 | |||
101 | # Compression engines allowed in version 1. THIS SHOULD NEVER CHANGE. |
|
101 | # Compression engines allowed in version 1. THIS SHOULD NEVER CHANGE. | |
102 | _bundlespecv1compengines = {b'gzip', b'bzip2', b'none'} |
|
102 | _bundlespecv1compengines = {b'gzip', b'bzip2', b'none'} | |
103 |
|
103 | |||
104 |
|
104 | |||
105 | def param_bool(key, value): |
|
105 | def param_bool(key, value): | |
106 | """make a boolean out of a parameter value""" |
|
106 | """make a boolean out of a parameter value""" | |
107 | b = stringutil.parsebool(value) |
|
107 | b = stringutil.parsebool(value) | |
108 | if b is None: |
|
108 | if b is None: | |
109 | msg = _(b"parameter %s should be a boolean ('%s')") |
|
109 | msg = _(b"parameter %s should be a boolean ('%s')") | |
110 | msg %= (key, value) |
|
110 | msg %= (key, value) | |
111 | raise error.InvalidBundleSpecification(msg) |
|
111 | raise error.InvalidBundleSpecification(msg) | |
112 | return b |
|
112 | return b | |
113 |
|
113 | |||
114 |
|
114 | |||
115 | # mapping of known parameter name need their value processed |
|
115 | # mapping of known parameter name need their value processed | |
116 | bundle_spec_param_processing = { |
|
116 | bundle_spec_param_processing = { | |
117 | b"obsolescence": param_bool, |
|
117 | b"obsolescence": param_bool, | |
118 | b"obsolescence-mandatory": param_bool, |
|
118 | b"obsolescence-mandatory": param_bool, | |
119 | b"phases": param_bool, |
|
119 | b"phases": param_bool, | |
120 | } |
|
120 | } | |
121 |
|
121 | |||
122 |
|
122 | |||
123 | def _parseparams(s): |
|
123 | def _parseparams(s): | |
124 | """parse bundlespec parameter section |
|
124 | """parse bundlespec parameter section | |
125 |
|
125 | |||
126 | input: "comp-version;params" string |
|
126 | input: "comp-version;params" string | |
127 |
|
127 | |||
128 | return: (spec; {param_key: param_value}) |
|
128 | return: (spec; {param_key: param_value}) | |
129 | """ |
|
129 | """ | |
130 | if b';' not in s: |
|
130 | if b';' not in s: | |
131 | return s, {} |
|
131 | return s, {} | |
132 |
|
132 | |||
133 | params = {} |
|
133 | params = {} | |
134 | version, paramstr = s.split(b';', 1) |
|
134 | version, paramstr = s.split(b';', 1) | |
135 |
|
135 | |||
136 | err = _(b'invalid bundle specification: missing "=" in parameter: %s') |
|
136 | err = _(b'invalid bundle specification: missing "=" in parameter: %s') | |
137 | for p in paramstr.split(b';'): |
|
137 | for p in paramstr.split(b';'): | |
138 | if b'=' not in p: |
|
138 | if b'=' not in p: | |
139 | msg = err % p |
|
139 | msg = err % p | |
140 | raise error.InvalidBundleSpecification(msg) |
|
140 | raise error.InvalidBundleSpecification(msg) | |
141 |
|
141 | |||
142 | key, value = p.split(b'=', 1) |
|
142 | key, value = p.split(b'=', 1) | |
143 | key = urlreq.unquote(key) |
|
143 | key = urlreq.unquote(key) | |
144 | value = urlreq.unquote(value) |
|
144 | value = urlreq.unquote(value) | |
145 | process = bundle_spec_param_processing.get(key) |
|
145 | process = bundle_spec_param_processing.get(key) | |
146 | if process is not None: |
|
146 | if process is not None: | |
147 | value = process(key, value) |
|
147 | value = process(key, value) | |
148 | params[key] = value |
|
148 | params[key] = value | |
149 |
|
149 | |||
150 | return version, params |
|
150 | return version, params | |
151 |
|
151 | |||
152 |
|
152 | |||
153 | def parsebundlespec(repo, spec, strict=True): |
|
153 | def parsebundlespec(repo, spec, strict=True): | |
154 | """Parse a bundle string specification into parts. |
|
154 | """Parse a bundle string specification into parts. | |
155 |
|
155 | |||
156 | Bundle specifications denote a well-defined bundle/exchange format. |
|
156 | Bundle specifications denote a well-defined bundle/exchange format. | |
157 | The content of a given specification should not change over time in |
|
157 | The content of a given specification should not change over time in | |
158 | order to ensure that bundles produced by a newer version of Mercurial are |
|
158 | order to ensure that bundles produced by a newer version of Mercurial are | |
159 | readable from an older version. |
|
159 | readable from an older version. | |
160 |
|
160 | |||
161 | The string currently has the form: |
|
161 | The string currently has the form: | |
162 |
|
162 | |||
163 | <compression>-<type>[;<parameter0>[;<parameter1>]] |
|
163 | <compression>-<type>[;<parameter0>[;<parameter1>]] | |
164 |
|
164 | |||
165 | Where <compression> is one of the supported compression formats |
|
165 | Where <compression> is one of the supported compression formats | |
166 | and <type> is (currently) a version string. A ";" can follow the type and |
|
166 | and <type> is (currently) a version string. A ";" can follow the type and | |
167 | all text afterwards is interpreted as URI encoded, ";" delimited key=value |
|
167 | all text afterwards is interpreted as URI encoded, ";" delimited key=value | |
168 | pairs. |
|
168 | pairs. | |
169 |
|
169 | |||
170 | If ``strict`` is True (the default) <compression> is required. Otherwise, |
|
170 | If ``strict`` is True (the default) <compression> is required. Otherwise, | |
171 | it is optional. |
|
171 | it is optional. | |
172 |
|
172 | |||
173 | Returns a bundlespec object of (compression, version, parameters). |
|
173 | Returns a bundlespec object of (compression, version, parameters). | |
174 | Compression will be ``None`` if not in strict mode and a compression isn't |
|
174 | Compression will be ``None`` if not in strict mode and a compression isn't | |
175 | defined. |
|
175 | defined. | |
176 |
|
176 | |||
177 | An ``InvalidBundleSpecification`` is raised when the specification is |
|
177 | An ``InvalidBundleSpecification`` is raised when the specification is | |
178 | not syntactically well formed. |
|
178 | not syntactically well formed. | |
179 |
|
179 | |||
180 | An ``UnsupportedBundleSpecification`` is raised when the compression or |
|
180 | An ``UnsupportedBundleSpecification`` is raised when the compression or | |
181 | bundle type/version is not recognized. |
|
181 | bundle type/version is not recognized. | |
182 |
|
182 | |||
183 | Note: this function will likely eventually return a more complex data |
|
183 | Note: this function will likely eventually return a more complex data | |
184 | structure, including bundle2 part information. |
|
184 | structure, including bundle2 part information. | |
185 | """ |
|
185 | """ | |
186 | if strict and b'-' not in spec: |
|
186 | if strict and b'-' not in spec: | |
187 | raise error.InvalidBundleSpecification( |
|
187 | raise error.InvalidBundleSpecification( | |
188 | _( |
|
188 | _( | |
189 | b'invalid bundle specification; ' |
|
189 | b'invalid bundle specification; ' | |
190 | b'must be prefixed with compression: %s' |
|
190 | b'must be prefixed with compression: %s' | |
191 | ) |
|
191 | ) | |
192 | % spec |
|
192 | % spec | |
193 | ) |
|
193 | ) | |
194 |
|
194 | |||
195 | if b'-' in spec: |
|
195 | pre_args = spec.split(b';', 1)[0] | |
|
196 | if b'-' in pre_args: | |||
196 | compression, version = spec.split(b'-', 1) |
|
197 | compression, version = spec.split(b'-', 1) | |
197 |
|
198 | |||
198 | if compression not in util.compengines.supportedbundlenames: |
|
199 | if compression not in util.compengines.supportedbundlenames: | |
199 | raise error.UnsupportedBundleSpecification( |
|
200 | raise error.UnsupportedBundleSpecification( | |
200 | _(b'%s compression is not supported') % compression |
|
201 | _(b'%s compression is not supported') % compression | |
201 | ) |
|
202 | ) | |
202 |
|
203 | |||
203 | version, params = _parseparams(version) |
|
204 | version, params = _parseparams(version) | |
204 |
|
205 | |||
205 | if version not in _bundlespeccontentopts: |
|
206 | if version not in _bundlespeccontentopts: | |
206 | raise error.UnsupportedBundleSpecification( |
|
207 | raise error.UnsupportedBundleSpecification( | |
207 | _(b'%s is not a recognized bundle version') % version |
|
208 | _(b'%s is not a recognized bundle version') % version | |
208 | ) |
|
209 | ) | |
209 | else: |
|
210 | else: | |
210 | # Value could be just the compression or just the version, in which |
|
211 | # Value could be just the compression or just the version, in which | |
211 | # case some defaults are assumed (but only when not in strict mode). |
|
212 | # case some defaults are assumed (but only when not in strict mode). | |
212 | assert not strict |
|
213 | assert not strict | |
213 |
|
214 | |||
214 | spec, params = _parseparams(spec) |
|
215 | spec, params = _parseparams(spec) | |
215 |
|
216 | |||
216 | if spec in util.compengines.supportedbundlenames: |
|
217 | if spec in util.compengines.supportedbundlenames: | |
217 | compression = spec |
|
218 | compression = spec | |
218 | version = b'v1' |
|
219 | version = b'v1' | |
219 | # Generaldelta repos require v2. |
|
220 | # Generaldelta repos require v2. | |
220 | if requirementsmod.GENERALDELTA_REQUIREMENT in repo.requirements: |
|
221 | if requirementsmod.GENERALDELTA_REQUIREMENT in repo.requirements: | |
221 | version = b'v2' |
|
222 | version = b'v2' | |
222 | elif requirementsmod.REVLOGV2_REQUIREMENT in repo.requirements: |
|
223 | elif requirementsmod.REVLOGV2_REQUIREMENT in repo.requirements: | |
223 | version = b'v2' |
|
224 | version = b'v2' | |
224 | # Modern compression engines require v2. |
|
225 | # Modern compression engines require v2. | |
225 | if compression not in _bundlespecv1compengines: |
|
226 | if compression not in _bundlespecv1compengines: | |
226 | version = b'v2' |
|
227 | version = b'v2' | |
227 | elif spec in _bundlespeccontentopts: |
|
228 | elif spec in _bundlespeccontentopts: | |
228 | if spec == b'packed1': |
|
229 | if spec == b'packed1': | |
229 | compression = b'none' |
|
230 | compression = b'none' | |
230 | else: |
|
231 | else: | |
231 | compression = b'bzip2' |
|
232 | compression = b'bzip2' | |
232 | version = spec |
|
233 | version = spec | |
233 | else: |
|
234 | else: | |
234 | raise error.UnsupportedBundleSpecification( |
|
235 | raise error.UnsupportedBundleSpecification( | |
235 | _(b'%s is not a recognized bundle specification') % spec |
|
236 | _(b'%s is not a recognized bundle specification') % spec | |
236 | ) |
|
237 | ) | |
237 |
|
238 | |||
238 | # Bundle version 1 only supports a known set of compression engines. |
|
239 | # Bundle version 1 only supports a known set of compression engines. | |
239 | if version == b'v1' and compression not in _bundlespecv1compengines: |
|
240 | if version == b'v1' and compression not in _bundlespecv1compengines: | |
240 | raise error.UnsupportedBundleSpecification( |
|
241 | raise error.UnsupportedBundleSpecification( | |
241 | _(b'compression engine %s is not supported on v1 bundles') |
|
242 | _(b'compression engine %s is not supported on v1 bundles') | |
242 | % compression |
|
243 | % compression | |
243 | ) |
|
244 | ) | |
244 |
|
245 | |||
245 | # The specification for packed1 can optionally declare the data formats |
|
246 | # The specification for packed1 can optionally declare the data formats | |
246 | # required to apply it. If we see this metadata, compare against what the |
|
247 | # required to apply it. If we see this metadata, compare against what the | |
247 | # repo supports and error if the bundle isn't compatible. |
|
248 | # repo supports and error if the bundle isn't compatible. | |
248 | if version == b'packed1' and b'requirements' in params: |
|
249 | if version == b'packed1' and b'requirements' in params: | |
249 | requirements = set(params[b'requirements'].split(b',')) |
|
250 | requirements = set(params[b'requirements'].split(b',')) | |
250 | missingreqs = requirements - requirementsmod.STREAM_FIXED_REQUIREMENTS |
|
251 | missingreqs = requirements - requirementsmod.STREAM_FIXED_REQUIREMENTS | |
251 | if missingreqs: |
|
252 | if missingreqs: | |
252 | raise error.UnsupportedBundleSpecification( |
|
253 | raise error.UnsupportedBundleSpecification( | |
253 | _(b'missing support for repository features: %s') |
|
254 | _(b'missing support for repository features: %s') | |
254 | % b', '.join(sorted(missingreqs)) |
|
255 | % b', '.join(sorted(missingreqs)) | |
255 | ) |
|
256 | ) | |
256 |
|
257 | |||
257 | # Compute contentopts based on the version |
|
258 | # Compute contentopts based on the version | |
258 | if b"stream" in params and params[b"stream"] == b"v2": |
|
259 | if b"stream" in params and params[b"stream"] == b"v2": | |
259 | # That case is fishy as this mostly derails the version selection |
|
260 | # That case is fishy as this mostly derails the version selection | |
260 | # mechanism. `stream` bundles are quite specific and used differently |
|
261 | # mechanism. `stream` bundles are quite specific and used differently | |
261 | # as "normal" bundles. |
|
262 | # as "normal" bundles. | |
262 | # |
|
263 | # | |
263 | # So we are pinning this to "v2", as this will likely be |
|
264 | # So we are pinning this to "v2", as this will likely be | |
264 | # compatible forever. (see the next conditional). |
|
265 | # compatible forever. (see the next conditional). | |
265 | # |
|
266 | # | |
266 | # (we should probably define a cleaner way to do this and raise a |
|
267 | # (we should probably define a cleaner way to do this and raise a | |
267 | # warning when the old way is encounter) |
|
268 | # warning when the old way is encounter) | |
268 | version = b"streamv2" |
|
269 | version = b"streamv2" | |
269 | contentopts = _bundlespeccontentopts.get(version, {}).copy() |
|
270 | contentopts = _bundlespeccontentopts.get(version, {}).copy() | |
270 | if version == b"streamv2": |
|
271 | if version == b"streamv2": | |
271 | # streamv2 have been reported as "v2" for a while. |
|
272 | # streamv2 have been reported as "v2" for a while. | |
272 | version = b"v2" |
|
273 | version = b"v2" | |
273 |
|
274 | |||
274 | engine = util.compengines.forbundlename(compression) |
|
275 | engine = util.compengines.forbundlename(compression) | |
275 | compression, wirecompression = engine.bundletype() |
|
276 | compression, wirecompression = engine.bundletype() | |
276 | wireversion = _bundlespeccontentopts[version][b'cg.version'] |
|
277 | wireversion = _bundlespeccontentopts[version][b'cg.version'] | |
277 |
|
278 | |||
278 | return bundlespec( |
|
279 | return bundlespec( | |
279 | compression, wirecompression, version, wireversion, params, contentopts |
|
280 | compression, wirecompression, version, wireversion, params, contentopts | |
280 | ) |
|
281 | ) | |
281 |
|
282 | |||
282 |
|
283 | |||
283 | def parseclonebundlesmanifest(repo, s): |
|
284 | def parseclonebundlesmanifest(repo, s): | |
284 | """Parses the raw text of a clone bundles manifest. |
|
285 | """Parses the raw text of a clone bundles manifest. | |
285 |
|
286 | |||
286 | Returns a list of dicts. The dicts have a ``URL`` key corresponding |
|
287 | Returns a list of dicts. The dicts have a ``URL`` key corresponding | |
287 | to the URL and other keys are the attributes for the entry. |
|
288 | to the URL and other keys are the attributes for the entry. | |
288 | """ |
|
289 | """ | |
289 | m = [] |
|
290 | m = [] | |
290 | for line in s.splitlines(): |
|
291 | for line in s.splitlines(): | |
291 | fields = line.split() |
|
292 | fields = line.split() | |
292 | if not fields: |
|
293 | if not fields: | |
293 | continue |
|
294 | continue | |
294 | attrs = {b'URL': fields[0]} |
|
295 | attrs = {b'URL': fields[0]} | |
295 | for rawattr in fields[1:]: |
|
296 | for rawattr in fields[1:]: | |
296 | key, value = rawattr.split(b'=', 1) |
|
297 | key, value = rawattr.split(b'=', 1) | |
297 | key = util.urlreq.unquote(key) |
|
298 | key = util.urlreq.unquote(key) | |
298 | value = util.urlreq.unquote(value) |
|
299 | value = util.urlreq.unquote(value) | |
299 | attrs[key] = value |
|
300 | attrs[key] = value | |
300 |
|
301 | |||
301 | # Parse BUNDLESPEC into components. This makes client-side |
|
302 | # Parse BUNDLESPEC into components. This makes client-side | |
302 | # preferences easier to specify since you can prefer a single |
|
303 | # preferences easier to specify since you can prefer a single | |
303 | # component of the BUNDLESPEC. |
|
304 | # component of the BUNDLESPEC. | |
304 | if key == b'BUNDLESPEC': |
|
305 | if key == b'BUNDLESPEC': | |
305 | try: |
|
306 | try: | |
306 | bundlespec = parsebundlespec(repo, value) |
|
307 | bundlespec = parsebundlespec(repo, value) | |
307 | attrs[b'COMPRESSION'] = bundlespec.compression |
|
308 | attrs[b'COMPRESSION'] = bundlespec.compression | |
308 | attrs[b'VERSION'] = bundlespec.version |
|
309 | attrs[b'VERSION'] = bundlespec.version | |
309 | except error.InvalidBundleSpecification: |
|
310 | except error.InvalidBundleSpecification: | |
310 | pass |
|
311 | pass | |
311 | except error.UnsupportedBundleSpecification: |
|
312 | except error.UnsupportedBundleSpecification: | |
312 | pass |
|
313 | pass | |
313 |
|
314 | |||
314 | m.append(attrs) |
|
315 | m.append(attrs) | |
315 |
|
316 | |||
316 | return m |
|
317 | return m | |
317 |
|
318 | |||
318 |
|
319 | |||
319 | def isstreamclonespec(bundlespec): |
|
320 | def isstreamclonespec(bundlespec): | |
320 | # Stream clone v1 |
|
321 | # Stream clone v1 | |
321 | if bundlespec.wirecompression == b'UN' and bundlespec.wireversion == b's1': |
|
322 | if bundlespec.wirecompression == b'UN' and bundlespec.wireversion == b's1': | |
322 | return True |
|
323 | return True | |
323 |
|
324 | |||
324 | # Stream clone v2 |
|
325 | # Stream clone v2 | |
325 | if ( |
|
326 | if ( | |
326 | bundlespec.wirecompression == b'UN' |
|
327 | bundlespec.wirecompression == b'UN' | |
327 | and bundlespec.wireversion == b'02' |
|
328 | and bundlespec.wireversion == b'02' | |
328 | and bundlespec.contentopts.get(b'streamv2') |
|
329 | and bundlespec.contentopts.get(b'streamv2') | |
329 | ): |
|
330 | ): | |
330 | return True |
|
331 | return True | |
331 |
|
332 | |||
332 | return False |
|
333 | return False | |
333 |
|
334 | |||
334 |
|
335 | |||
335 | def filterclonebundleentries(repo, entries, streamclonerequested=False): |
|
336 | def filterclonebundleentries(repo, entries, streamclonerequested=False): | |
336 | """Remove incompatible clone bundle manifest entries. |
|
337 | """Remove incompatible clone bundle manifest entries. | |
337 |
|
338 | |||
338 | Accepts a list of entries parsed with ``parseclonebundlesmanifest`` |
|
339 | Accepts a list of entries parsed with ``parseclonebundlesmanifest`` | |
339 | and returns a new list consisting of only the entries that this client |
|
340 | and returns a new list consisting of only the entries that this client | |
340 | should be able to apply. |
|
341 | should be able to apply. | |
341 |
|
342 | |||
342 | There is no guarantee we'll be able to apply all returned entries because |
|
343 | There is no guarantee we'll be able to apply all returned entries because | |
343 | the metadata we use to filter on may be missing or wrong. |
|
344 | the metadata we use to filter on may be missing or wrong. | |
344 | """ |
|
345 | """ | |
345 | newentries = [] |
|
346 | newentries = [] | |
346 | for entry in entries: |
|
347 | for entry in entries: | |
347 | spec = entry.get(b'BUNDLESPEC') |
|
348 | spec = entry.get(b'BUNDLESPEC') | |
348 | if spec: |
|
349 | if spec: | |
349 | try: |
|
350 | try: | |
350 | bundlespec = parsebundlespec(repo, spec, strict=True) |
|
351 | bundlespec = parsebundlespec(repo, spec, strict=True) | |
351 |
|
352 | |||
352 | # If a stream clone was requested, filter out non-streamclone |
|
353 | # If a stream clone was requested, filter out non-streamclone | |
353 | # entries. |
|
354 | # entries. | |
354 | if streamclonerequested and not isstreamclonespec(bundlespec): |
|
355 | if streamclonerequested and not isstreamclonespec(bundlespec): | |
355 | repo.ui.debug( |
|
356 | repo.ui.debug( | |
356 | b'filtering %s because not a stream clone\n' |
|
357 | b'filtering %s because not a stream clone\n' | |
357 | % entry[b'URL'] |
|
358 | % entry[b'URL'] | |
358 | ) |
|
359 | ) | |
359 | continue |
|
360 | continue | |
360 |
|
361 | |||
361 | except error.InvalidBundleSpecification as e: |
|
362 | except error.InvalidBundleSpecification as e: | |
362 | repo.ui.debug(stringutil.forcebytestr(e) + b'\n') |
|
363 | repo.ui.debug(stringutil.forcebytestr(e) + b'\n') | |
363 | continue |
|
364 | continue | |
364 | except error.UnsupportedBundleSpecification as e: |
|
365 | except error.UnsupportedBundleSpecification as e: | |
365 | repo.ui.debug( |
|
366 | repo.ui.debug( | |
366 | b'filtering %s because unsupported bundle ' |
|
367 | b'filtering %s because unsupported bundle ' | |
367 | b'spec: %s\n' % (entry[b'URL'], stringutil.forcebytestr(e)) |
|
368 | b'spec: %s\n' % (entry[b'URL'], stringutil.forcebytestr(e)) | |
368 | ) |
|
369 | ) | |
369 | continue |
|
370 | continue | |
370 | # If we don't have a spec and requested a stream clone, we don't know |
|
371 | # If we don't have a spec and requested a stream clone, we don't know | |
371 | # what the entry is so don't attempt to apply it. |
|
372 | # what the entry is so don't attempt to apply it. | |
372 | elif streamclonerequested: |
|
373 | elif streamclonerequested: | |
373 | repo.ui.debug( |
|
374 | repo.ui.debug( | |
374 | b'filtering %s because cannot determine if a stream ' |
|
375 | b'filtering %s because cannot determine if a stream ' | |
375 | b'clone bundle\n' % entry[b'URL'] |
|
376 | b'clone bundle\n' % entry[b'URL'] | |
376 | ) |
|
377 | ) | |
377 | continue |
|
378 | continue | |
378 |
|
379 | |||
379 | if b'REQUIRESNI' in entry and not sslutil.hassni: |
|
380 | if b'REQUIRESNI' in entry and not sslutil.hassni: | |
380 | repo.ui.debug( |
|
381 | repo.ui.debug( | |
381 | b'filtering %s because SNI not supported\n' % entry[b'URL'] |
|
382 | b'filtering %s because SNI not supported\n' % entry[b'URL'] | |
382 | ) |
|
383 | ) | |
383 | continue |
|
384 | continue | |
384 |
|
385 | |||
385 | if b'REQUIREDRAM' in entry: |
|
386 | if b'REQUIREDRAM' in entry: | |
386 | try: |
|
387 | try: | |
387 | requiredram = util.sizetoint(entry[b'REQUIREDRAM']) |
|
388 | requiredram = util.sizetoint(entry[b'REQUIREDRAM']) | |
388 | except error.ParseError: |
|
389 | except error.ParseError: | |
389 | repo.ui.debug( |
|
390 | repo.ui.debug( | |
390 | b'filtering %s due to a bad REQUIREDRAM attribute\n' |
|
391 | b'filtering %s due to a bad REQUIREDRAM attribute\n' | |
391 | % entry[b'URL'] |
|
392 | % entry[b'URL'] | |
392 | ) |
|
393 | ) | |
393 | continue |
|
394 | continue | |
394 | actualram = repo.ui.estimatememory() |
|
395 | actualram = repo.ui.estimatememory() | |
395 | if actualram is not None and actualram * 0.66 < requiredram: |
|
396 | if actualram is not None and actualram * 0.66 < requiredram: | |
396 | repo.ui.debug( |
|
397 | repo.ui.debug( | |
397 | b'filtering %s as it needs more than 2/3 of system memory\n' |
|
398 | b'filtering %s as it needs more than 2/3 of system memory\n' | |
398 | % entry[b'URL'] |
|
399 | % entry[b'URL'] | |
399 | ) |
|
400 | ) | |
400 | continue |
|
401 | continue | |
401 |
|
402 | |||
402 | newentries.append(entry) |
|
403 | newentries.append(entry) | |
403 |
|
404 | |||
404 | return newentries |
|
405 | return newentries | |
405 |
|
406 | |||
406 |
|
407 | |||
407 | class clonebundleentry: |
|
408 | class clonebundleentry: | |
408 | """Represents an item in a clone bundles manifest. |
|
409 | """Represents an item in a clone bundles manifest. | |
409 |
|
410 | |||
410 | This rich class is needed to support sorting since sorted() in Python 3 |
|
411 | This rich class is needed to support sorting since sorted() in Python 3 | |
411 | doesn't support ``cmp`` and our comparison is complex enough that ``key=`` |
|
412 | doesn't support ``cmp`` and our comparison is complex enough that ``key=`` | |
412 | won't work. |
|
413 | won't work. | |
413 | """ |
|
414 | """ | |
414 |
|
415 | |||
415 | def __init__(self, value, prefers): |
|
416 | def __init__(self, value, prefers): | |
416 | self.value = value |
|
417 | self.value = value | |
417 | self.prefers = prefers |
|
418 | self.prefers = prefers | |
418 |
|
419 | |||
419 | def _cmp(self, other): |
|
420 | def _cmp(self, other): | |
420 | for prefkey, prefvalue in self.prefers: |
|
421 | for prefkey, prefvalue in self.prefers: | |
421 | avalue = self.value.get(prefkey) |
|
422 | avalue = self.value.get(prefkey) | |
422 | bvalue = other.value.get(prefkey) |
|
423 | bvalue = other.value.get(prefkey) | |
423 |
|
424 | |||
424 | # Special case for b missing attribute and a matches exactly. |
|
425 | # Special case for b missing attribute and a matches exactly. | |
425 | if avalue is not None and bvalue is None and avalue == prefvalue: |
|
426 | if avalue is not None and bvalue is None and avalue == prefvalue: | |
426 | return -1 |
|
427 | return -1 | |
427 |
|
428 | |||
428 | # Special case for a missing attribute and b matches exactly. |
|
429 | # Special case for a missing attribute and b matches exactly. | |
429 | if bvalue is not None and avalue is None and bvalue == prefvalue: |
|
430 | if bvalue is not None and avalue is None and bvalue == prefvalue: | |
430 | return 1 |
|
431 | return 1 | |
431 |
|
432 | |||
432 | # We can't compare unless attribute present on both. |
|
433 | # We can't compare unless attribute present on both. | |
433 | if avalue is None or bvalue is None: |
|
434 | if avalue is None or bvalue is None: | |
434 | continue |
|
435 | continue | |
435 |
|
436 | |||
436 | # Same values should fall back to next attribute. |
|
437 | # Same values should fall back to next attribute. | |
437 | if avalue == bvalue: |
|
438 | if avalue == bvalue: | |
438 | continue |
|
439 | continue | |
439 |
|
440 | |||
440 | # Exact matches come first. |
|
441 | # Exact matches come first. | |
441 | if avalue == prefvalue: |
|
442 | if avalue == prefvalue: | |
442 | return -1 |
|
443 | return -1 | |
443 | if bvalue == prefvalue: |
|
444 | if bvalue == prefvalue: | |
444 | return 1 |
|
445 | return 1 | |
445 |
|
446 | |||
446 | # Fall back to next attribute. |
|
447 | # Fall back to next attribute. | |
447 | continue |
|
448 | continue | |
448 |
|
449 | |||
449 | # If we got here we couldn't sort by attributes and prefers. Fall |
|
450 | # If we got here we couldn't sort by attributes and prefers. Fall | |
450 | # back to index order. |
|
451 | # back to index order. | |
451 | return 0 |
|
452 | return 0 | |
452 |
|
453 | |||
453 | def __lt__(self, other): |
|
454 | def __lt__(self, other): | |
454 | return self._cmp(other) < 0 |
|
455 | return self._cmp(other) < 0 | |
455 |
|
456 | |||
456 | def __gt__(self, other): |
|
457 | def __gt__(self, other): | |
457 | return self._cmp(other) > 0 |
|
458 | return self._cmp(other) > 0 | |
458 |
|
459 | |||
459 | def __eq__(self, other): |
|
460 | def __eq__(self, other): | |
460 | return self._cmp(other) == 0 |
|
461 | return self._cmp(other) == 0 | |
461 |
|
462 | |||
462 | def __le__(self, other): |
|
463 | def __le__(self, other): | |
463 | return self._cmp(other) <= 0 |
|
464 | return self._cmp(other) <= 0 | |
464 |
|
465 | |||
465 | def __ge__(self, other): |
|
466 | def __ge__(self, other): | |
466 | return self._cmp(other) >= 0 |
|
467 | return self._cmp(other) >= 0 | |
467 |
|
468 | |||
468 | def __ne__(self, other): |
|
469 | def __ne__(self, other): | |
469 | return self._cmp(other) != 0 |
|
470 | return self._cmp(other) != 0 | |
470 |
|
471 | |||
471 |
|
472 | |||
472 | def sortclonebundleentries(ui, entries): |
|
473 | def sortclonebundleentries(ui, entries): | |
473 | prefers = ui.configlist(b'ui', b'clonebundleprefers') |
|
474 | prefers = ui.configlist(b'ui', b'clonebundleprefers') | |
474 | if not prefers: |
|
475 | if not prefers: | |
475 | return list(entries) |
|
476 | return list(entries) | |
476 |
|
477 | |||
477 | def _split(p): |
|
478 | def _split(p): | |
478 | if b'=' not in p: |
|
479 | if b'=' not in p: | |
479 | hint = _(b"each comma separated item should be key=value pairs") |
|
480 | hint = _(b"each comma separated item should be key=value pairs") | |
480 | raise error.Abort( |
|
481 | raise error.Abort( | |
481 | _(b"invalid ui.clonebundleprefers item: %s") % p, hint=hint |
|
482 | _(b"invalid ui.clonebundleprefers item: %s") % p, hint=hint | |
482 | ) |
|
483 | ) | |
483 | return p.split(b'=', 1) |
|
484 | return p.split(b'=', 1) | |
484 |
|
485 | |||
485 | prefers = [_split(p) for p in prefers] |
|
486 | prefers = [_split(p) for p in prefers] | |
486 |
|
487 | |||
487 | items = sorted(clonebundleentry(v, prefers) for v in entries) |
|
488 | items = sorted(clonebundleentry(v, prefers) for v in entries) | |
488 | return [i.value for i in items] |
|
489 | return [i.value for i in items] |
@@ -1,1515 +1,1523 b'' | |||||
1 | ================================================== |
|
1 | ================================================== | |
2 | Test obsmarkers interaction with bundle and strip |
|
2 | Test obsmarkers interaction with bundle and strip | |
3 | ================================================== |
|
3 | ================================================== | |
4 |
|
4 | |||
5 | Setup a repository with various case |
|
5 | Setup a repository with various case | |
6 | ==================================== |
|
6 | ==================================== | |
7 |
|
7 | |||
8 | Config setup |
|
8 | Config setup | |
9 | ------------ |
|
9 | ------------ | |
10 |
|
10 | |||
11 | $ cat >> $HGRCPATH <<EOF |
|
11 | $ cat >> $HGRCPATH <<EOF | |
12 | > [command-templates] |
|
12 | > [command-templates] | |
13 | > # simpler log output |
|
13 | > # simpler log output | |
14 | > log = "{node|short}: {desc}\n" |
|
14 | > log = "{node|short}: {desc}\n" | |
15 | > |
|
15 | > | |
16 | > [experimental] |
|
16 | > [experimental] | |
17 | > # enable evolution |
|
17 | > # enable evolution | |
18 | > evolution=true |
|
18 | > evolution=true | |
19 | > |
|
19 | > | |
20 | > # include obsmarkers in bundle |
|
20 | > # include obsmarkers in bundle | |
21 | > evolution.bundle-obsmarker = yes |
|
21 | > evolution.bundle-obsmarker = yes | |
22 | > |
|
22 | > | |
23 | > [extensions] |
|
23 | > [extensions] | |
24 | > # needed for some tests |
|
24 | > # needed for some tests | |
25 | > strip = |
|
25 | > strip = | |
26 | > [defaults] |
|
26 | > [defaults] | |
27 | > # we'll query many hidden changeset |
|
27 | > # we'll query many hidden changeset | |
28 | > debugobsolete = --hidden |
|
28 | > debugobsolete = --hidden | |
29 | > EOF |
|
29 | > EOF | |
30 |
|
30 | |||
31 | $ mkcommit() { |
|
31 | $ mkcommit() { | |
32 | > echo "$1" > "$1" |
|
32 | > echo "$1" > "$1" | |
33 | > hg add "$1" |
|
33 | > hg add "$1" | |
34 | > hg ci -m "$1" |
|
34 | > hg ci -m "$1" | |
35 | > } |
|
35 | > } | |
36 |
|
36 | |||
37 | $ getid() { |
|
37 | $ getid() { | |
38 | > hg log --hidden --template '{node}\n' --rev "$1" |
|
38 | > hg log --hidden --template '{node}\n' --rev "$1" | |
39 | > } |
|
39 | > } | |
40 |
|
40 | |||
41 | $ mktestrepo () { |
|
41 | $ mktestrepo () { | |
42 | > [ -n "$1" ] || exit 1 |
|
42 | > [ -n "$1" ] || exit 1 | |
43 | > cd $TESTTMP |
|
43 | > cd $TESTTMP | |
44 | > hg init $1 |
|
44 | > hg init $1 | |
45 | > cd $1 |
|
45 | > cd $1 | |
46 | > mkcommit ROOT |
|
46 | > mkcommit ROOT | |
47 | > } |
|
47 | > } | |
48 |
|
48 | |||
49 | Function to compare the expected bundled obsmarkers with the actually bundled |
|
49 | Function to compare the expected bundled obsmarkers with the actually bundled | |
50 | obsmarkers. It also check the obsmarkers backed up during strip. |
|
50 | obsmarkers. It also check the obsmarkers backed up during strip. | |
51 |
|
51 | |||
52 | $ testrevs () { |
|
52 | $ testrevs () { | |
53 | > revs="$1" |
|
53 | > revs="$1" | |
54 | > testname=`basename \`pwd\`` |
|
54 | > testname=`basename \`pwd\`` | |
55 | > revsname=`hg --hidden log -T '-{desc}' --rev "${revs}"` |
|
55 | > revsname=`hg --hidden log -T '-{desc}' --rev "${revs}"` | |
56 | > prefix="${TESTTMP}/${testname}${revsname}" |
|
56 | > prefix="${TESTTMP}/${testname}${revsname}" | |
57 | > markersfile="${prefix}-relevant-markers.txt" |
|
57 | > markersfile="${prefix}-relevant-markers.txt" | |
58 | > exclufile="${prefix}-exclusive-markers.txt" |
|
58 | > exclufile="${prefix}-exclusive-markers.txt" | |
59 | > bundlefile="${prefix}-bundle.hg" |
|
59 | > bundlefile="${prefix}-bundle.hg" | |
60 | > contentfile="${prefix}-bundle-markers.hg" |
|
60 | > contentfile="${prefix}-bundle-markers.hg" | |
61 | > stripcontentfile="${prefix}-bundle-markers.hg" |
|
61 | > stripcontentfile="${prefix}-bundle-markers.hg" | |
62 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" |
|
62 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" | |
63 | > hg debugobsolete --hidden --rev "${revs}" --exclusive | sed 's/^/ /' > "${exclufile}" |
|
63 | > hg debugobsolete --hidden --rev "${revs}" --exclusive | sed 's/^/ /' > "${exclufile}" | |
64 | > echo '### Matched revisions###' |
|
64 | > echo '### Matched revisions###' | |
65 | > hg log --hidden --rev "${revs}" | sort |
|
65 | > hg log --hidden --rev "${revs}" | sort | |
66 | > echo '### Relevant markers ###' |
|
66 | > echo '### Relevant markers ###' | |
67 | > cat "${markersfile}" |
|
67 | > cat "${markersfile}" | |
68 | > printf "# bundling: " |
|
68 | > printf "# bundling: " | |
69 | > hg bundle --hidden --base "parents(roots(${revs}))" --rev "${revs}" "${bundlefile}" |
|
69 | > hg bundle --hidden --base "parents(roots(${revs}))" --rev "${revs}" "${bundlefile}" | |
70 | > hg debugbundle --part-type obsmarkers "${bundlefile}" | sed 1,3d > "${contentfile}" |
|
70 | > hg debugbundle --part-type obsmarkers "${bundlefile}" | sed 1,3d > "${contentfile}" | |
71 | > echo '### Bundled markers ###' |
|
71 | > echo '### Bundled markers ###' | |
72 | > cat "${contentfile}" |
|
72 | > cat "${contentfile}" | |
73 | > echo '### diff <relevant> <bundled> ###' |
|
73 | > echo '### diff <relevant> <bundled> ###' | |
74 | > cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}" |
|
74 | > cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}" | |
75 | > echo '#################################' |
|
75 | > echo '#################################' | |
76 | > echo '### Exclusive markers ###' |
|
76 | > echo '### Exclusive markers ###' | |
77 | > cat "${exclufile}" |
|
77 | > cat "${exclufile}" | |
78 | > # if the matched revs do not have children, we also check the result of strip |
|
78 | > # if the matched revs do not have children, we also check the result of strip | |
79 | > children=`hg log --hidden --rev "((${revs})::) - (${revs})"` |
|
79 | > children=`hg log --hidden --rev "((${revs})::) - (${revs})"` | |
80 | > if [ -z "$children" ]; |
|
80 | > if [ -z "$children" ]; | |
81 | > then |
|
81 | > then | |
82 | > printf "# stripping: " |
|
82 | > printf "# stripping: " | |
83 | > prestripfile="${prefix}-pre-strip.txt" |
|
83 | > prestripfile="${prefix}-pre-strip.txt" | |
84 | > poststripfile="${prefix}-post-strip.txt" |
|
84 | > poststripfile="${prefix}-post-strip.txt" | |
85 | > strippedfile="${prefix}-stripped-markers.txt" |
|
85 | > strippedfile="${prefix}-stripped-markers.txt" | |
86 | > hg debugobsolete --hidden | sort | sed 's/^/ /' > "${prestripfile}" |
|
86 | > hg debugobsolete --hidden | sort | sed 's/^/ /' > "${prestripfile}" | |
87 | > hg strip --hidden --rev "${revs}" |
|
87 | > hg strip --hidden --rev "${revs}" | |
88 | > hg debugobsolete --hidden | sort | sed 's/^/ /' > "${poststripfile}" |
|
88 | > hg debugobsolete --hidden | sort | sed 's/^/ /' > "${poststripfile}" | |
89 | > hg debugbundle --part-type obsmarkers .hg/strip-backup/* | sed 1,3d > "${stripcontentfile}" |
|
89 | > hg debugbundle --part-type obsmarkers .hg/strip-backup/* | sed 1,3d > "${stripcontentfile}" | |
90 | > echo '### Backup markers ###' |
|
90 | > echo '### Backup markers ###' | |
91 | > cat "${stripcontentfile}" |
|
91 | > cat "${stripcontentfile}" | |
92 | > echo '### diff <relevant> <backed-up> ###' |
|
92 | > echo '### diff <relevant> <backed-up> ###' | |
93 | > cmp "${markersfile}" "${stripcontentfile}" || diff -u "${markersfile}" "${stripcontentfile}" |
|
93 | > cmp "${markersfile}" "${stripcontentfile}" || diff -u "${markersfile}" "${stripcontentfile}" | |
94 | > echo '#################################' |
|
94 | > echo '#################################' | |
95 | > cat "${prestripfile}" "${poststripfile}" | sort | uniq -u > "${strippedfile}" |
|
95 | > cat "${prestripfile}" "${poststripfile}" | sort | uniq -u > "${strippedfile}" | |
96 | > echo '### Stripped markers ###' |
|
96 | > echo '### Stripped markers ###' | |
97 | > cat "${strippedfile}" |
|
97 | > cat "${strippedfile}" | |
98 | > echo '### diff <exclusive> <stripped> ###' |
|
98 | > echo '### diff <exclusive> <stripped> ###' | |
99 | > cmp "${exclufile}" "${strippedfile}" || diff -u "${exclufile}" "${strippedfile}" |
|
99 | > cmp "${exclufile}" "${strippedfile}" || diff -u "${exclufile}" "${strippedfile}" | |
100 | > echo '#################################' |
|
100 | > echo '#################################' | |
101 | > # restore and clean up repo for the next test |
|
101 | > # restore and clean up repo for the next test | |
102 | > hg unbundle .hg/strip-backup/* | sed 's/^/# unbundling: /' |
|
102 | > hg unbundle .hg/strip-backup/* | sed 's/^/# unbundling: /' | |
103 | > # clean up directory for the next test |
|
103 | > # clean up directory for the next test | |
104 | > rm .hg/strip-backup/* |
|
104 | > rm .hg/strip-backup/* | |
105 | > fi |
|
105 | > fi | |
106 | > } |
|
106 | > } | |
107 |
|
107 | |||
108 | root setup |
|
108 | root setup | |
109 | ------------- |
|
109 | ------------- | |
110 |
|
110 | |||
111 | simple chain |
|
111 | simple chain | |
112 | ============ |
|
112 | ============ | |
113 |
|
113 | |||
114 | . A0 |
|
114 | . A0 | |
115 | . β ΓΈβ β A1 |
|
115 | . β ΓΈβ β A1 | |
116 | . |/ |
|
116 | . |/ | |
117 | . β |
|
117 | . β | |
118 |
|
118 | |||
119 | setup |
|
119 | setup | |
120 | ----- |
|
120 | ----- | |
121 |
|
121 | |||
122 | $ mktestrepo simple-chain |
|
122 | $ mktestrepo simple-chain | |
123 | $ mkcommit 'C-A0' |
|
123 | $ mkcommit 'C-A0' | |
124 | $ hg up 'desc("ROOT")' |
|
124 | $ hg up 'desc("ROOT")' | |
125 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
125 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
126 | $ mkcommit 'C-A1' |
|
126 | $ mkcommit 'C-A1' | |
127 | created new head |
|
127 | created new head | |
128 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
128 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
129 | 1 new obsolescence markers |
|
129 | 1 new obsolescence markers | |
130 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 |
|
130 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 | |
131 | 1 new obsolescence markers |
|
131 | 1 new obsolescence markers | |
132 | obsoleted 1 changesets |
|
132 | obsoleted 1 changesets | |
133 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` |
|
133 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` | |
134 | 1 new obsolescence markers |
|
134 | 1 new obsolescence markers | |
135 |
|
135 | |||
136 | $ hg up 'desc("ROOT")' |
|
136 | $ hg up 'desc("ROOT")' | |
137 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
137 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
138 | $ hg log --hidden -G |
|
138 | $ hg log --hidden -G | |
139 | o cf2c22470d67: C-A1 |
|
139 | o cf2c22470d67: C-A1 | |
140 | | |
|
140 | | | |
141 | | x 84fcb0dfe17b: C-A0 |
|
141 | | x 84fcb0dfe17b: C-A0 | |
142 | |/ |
|
142 | |/ | |
143 | @ ea207398892e: ROOT |
|
143 | @ ea207398892e: ROOT | |
144 |
|
144 | |||
145 | $ hg debugobsolete |
|
145 | $ hg debugobsolete | |
146 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
146 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
147 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
147 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
148 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
148 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
149 |
|
149 | |||
150 | Actual testing |
|
150 | Actual testing | |
151 | -------------- |
|
151 | -------------- | |
152 |
|
152 | |||
153 | $ testrevs 'desc("C-A0")' |
|
153 | $ testrevs 'desc("C-A0")' | |
154 | ### Matched revisions### |
|
154 | ### Matched revisions### | |
155 | 84fcb0dfe17b: C-A0 |
|
155 | 84fcb0dfe17b: C-A0 | |
156 | ### Relevant markers ### |
|
156 | ### Relevant markers ### | |
157 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
157 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
158 | # bundling: 1 changesets found |
|
158 | # bundling: 1 changesets found | |
159 | ### Bundled markers ### |
|
159 | ### Bundled markers ### | |
160 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
160 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
161 | ### diff <relevant> <bundled> ### |
|
161 | ### diff <relevant> <bundled> ### | |
162 | ################################# |
|
162 | ################################# | |
163 | ### Exclusive markers ### |
|
163 | ### Exclusive markers ### | |
164 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg |
|
164 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg | |
165 | ### Backup markers ### |
|
165 | ### Backup markers ### | |
166 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
166 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
167 | ### diff <relevant> <backed-up> ### |
|
167 | ### diff <relevant> <backed-up> ### | |
168 | ################################# |
|
168 | ################################# | |
169 | ### Stripped markers ### |
|
169 | ### Stripped markers ### | |
170 | ### diff <exclusive> <stripped> ### |
|
170 | ### diff <exclusive> <stripped> ### | |
171 | ################################# |
|
171 | ################################# | |
172 | # unbundling: adding changesets |
|
172 | # unbundling: adding changesets | |
173 | # unbundling: adding manifests |
|
173 | # unbundling: adding manifests | |
174 | # unbundling: adding file changes |
|
174 | # unbundling: adding file changes | |
175 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
175 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
176 | # unbundling: (1 other changesets obsolete on arrival) |
|
176 | # unbundling: (1 other changesets obsolete on arrival) | |
177 | # unbundling: (run 'hg heads' to see heads) |
|
177 | # unbundling: (run 'hg heads' to see heads) | |
178 |
|
178 | |||
179 | $ testrevs 'desc("C-A1")' |
|
179 | $ testrevs 'desc("C-A1")' | |
180 | ### Matched revisions### |
|
180 | ### Matched revisions### | |
181 | cf2c22470d67: C-A1 |
|
181 | cf2c22470d67: C-A1 | |
182 | ### Relevant markers ### |
|
182 | ### Relevant markers ### | |
183 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
183 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
184 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
184 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
185 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
185 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
186 | # bundling: 1 changesets found |
|
186 | # bundling: 1 changesets found | |
187 | ### Bundled markers ### |
|
187 | ### Bundled markers ### | |
188 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
188 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
189 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
189 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
190 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
190 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
191 | ### diff <relevant> <bundled> ### |
|
191 | ### diff <relevant> <bundled> ### | |
192 | ################################# |
|
192 | ################################# | |
193 | ### Exclusive markers ### |
|
193 | ### Exclusive markers ### | |
194 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
194 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
195 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
195 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
196 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg |
|
196 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |
197 | ### Backup markers ### |
|
197 | ### Backup markers ### | |
198 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
198 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
199 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
199 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
200 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
200 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
201 | ### diff <relevant> <backed-up> ### |
|
201 | ### diff <relevant> <backed-up> ### | |
202 | ################################# |
|
202 | ################################# | |
203 | ### Stripped markers ### |
|
203 | ### Stripped markers ### | |
204 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
204 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
205 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
205 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
206 | ### diff <exclusive> <stripped> ### |
|
206 | ### diff <exclusive> <stripped> ### | |
207 | ################################# |
|
207 | ################################# | |
208 | # unbundling: adding changesets |
|
208 | # unbundling: adding changesets | |
209 | # unbundling: adding manifests |
|
209 | # unbundling: adding manifests | |
210 | # unbundling: adding file changes |
|
210 | # unbundling: adding file changes | |
211 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
211 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
212 | # unbundling: 2 new obsolescence markers |
|
212 | # unbundling: 2 new obsolescence markers | |
213 | # unbundling: obsoleted 1 changesets |
|
213 | # unbundling: obsoleted 1 changesets | |
214 | # unbundling: new changesets cf2c22470d67 (1 drafts) |
|
214 | # unbundling: new changesets cf2c22470d67 (1 drafts) | |
215 | # unbundling: (run 'hg heads' to see heads) |
|
215 | # unbundling: (run 'hg heads' to see heads) | |
216 |
|
216 | |||
217 | $ testrevs 'desc("C-A")' |
|
217 | $ testrevs 'desc("C-A")' | |
218 | ### Matched revisions### |
|
218 | ### Matched revisions### | |
219 | 84fcb0dfe17b: C-A0 |
|
219 | 84fcb0dfe17b: C-A0 | |
220 | cf2c22470d67: C-A1 |
|
220 | cf2c22470d67: C-A1 | |
221 | ### Relevant markers ### |
|
221 | ### Relevant markers ### | |
222 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
222 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
223 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
223 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
224 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
224 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
225 | # bundling: 2 changesets found |
|
225 | # bundling: 2 changesets found | |
226 | ### Bundled markers ### |
|
226 | ### Bundled markers ### | |
227 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
227 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
228 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
228 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
229 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
229 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
230 | ### diff <relevant> <bundled> ### |
|
230 | ### diff <relevant> <bundled> ### | |
231 | ################################# |
|
231 | ################################# | |
232 | ### Exclusive markers ### |
|
232 | ### Exclusive markers ### | |
233 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
233 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
234 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
234 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
235 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
235 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
236 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg |
|
236 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg | |
237 | ### Backup markers ### |
|
237 | ### Backup markers ### | |
238 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
238 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
239 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
239 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
240 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
240 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
241 | ### diff <relevant> <backed-up> ### |
|
241 | ### diff <relevant> <backed-up> ### | |
242 | ################################# |
|
242 | ################################# | |
243 | ### Stripped markers ### |
|
243 | ### Stripped markers ### | |
244 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
244 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
245 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
245 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
246 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
246 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
247 | ### diff <exclusive> <stripped> ### |
|
247 | ### diff <exclusive> <stripped> ### | |
248 | ################################# |
|
248 | ################################# | |
249 | # unbundling: adding changesets |
|
249 | # unbundling: adding changesets | |
250 | # unbundling: adding manifests |
|
250 | # unbundling: adding manifests | |
251 | # unbundling: adding file changes |
|
251 | # unbundling: adding file changes | |
252 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) |
|
252 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) | |
253 | # unbundling: 3 new obsolescence markers |
|
253 | # unbundling: 3 new obsolescence markers | |
254 | # unbundling: new changesets cf2c22470d67 (1 drafts) |
|
254 | # unbundling: new changesets cf2c22470d67 (1 drafts) | |
255 | # unbundling: (1 other changesets obsolete on arrival) |
|
255 | # unbundling: (1 other changesets obsolete on arrival) | |
256 | # unbundling: (run 'hg heads' to see heads) |
|
256 | # unbundling: (run 'hg heads' to see heads) | |
257 |
|
257 | |||
258 | chain with prune children |
|
258 | chain with prune children | |
259 | ========================= |
|
259 | ========================= | |
260 |
|
260 | |||
261 | . β β B0 |
|
261 | . β β B0 | |
262 | . | |
|
262 | . | | |
263 | . β ΓΈβ β A1 |
|
263 | . β ΓΈβ β A1 | |
264 | . | |
|
264 | . | | |
265 | . β |
|
265 | . β | |
266 |
|
266 | |||
267 | setup |
|
267 | setup | |
268 | ----- |
|
268 | ----- | |
269 |
|
269 | |||
270 | $ mktestrepo prune |
|
270 | $ mktestrepo prune | |
271 | $ mkcommit 'C-A0' |
|
271 | $ mkcommit 'C-A0' | |
272 | $ mkcommit 'C-B0' |
|
272 | $ mkcommit 'C-B0' | |
273 | $ hg up 'desc("ROOT")' |
|
273 | $ hg up 'desc("ROOT")' | |
274 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
274 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
275 | $ mkcommit 'C-A1' |
|
275 | $ mkcommit 'C-A1' | |
276 | created new head |
|
276 | created new head | |
277 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
277 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
278 | 1 new obsolescence markers |
|
278 | 1 new obsolescence markers | |
279 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
279 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
280 | 1 new obsolescence markers |
|
280 | 1 new obsolescence markers | |
281 | obsoleted 1 changesets |
|
281 | obsoleted 1 changesets | |
282 | 1 new orphan changesets |
|
282 | 1 new orphan changesets | |
283 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
283 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
284 | 1 new obsolescence markers |
|
284 | 1 new obsolescence markers | |
285 | obsoleted 1 changesets |
|
285 | obsoleted 1 changesets | |
286 | $ hg up 'desc("ROOT")' |
|
286 | $ hg up 'desc("ROOT")' | |
287 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
287 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
288 | $ hg log --hidden -G |
|
288 | $ hg log --hidden -G | |
289 | o cf2c22470d67: C-A1 |
|
289 | o cf2c22470d67: C-A1 | |
290 | | |
|
290 | | | |
291 | | x 29f93b1df87b: C-B0 |
|
291 | | x 29f93b1df87b: C-B0 | |
292 | | | |
|
292 | | | | |
293 | | x 84fcb0dfe17b: C-A0 |
|
293 | | x 84fcb0dfe17b: C-A0 | |
294 | |/ |
|
294 | |/ | |
295 | @ ea207398892e: ROOT |
|
295 | @ ea207398892e: ROOT | |
296 |
|
296 | |||
297 | $ hg debugobsolete |
|
297 | $ hg debugobsolete | |
298 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
298 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
299 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
299 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
300 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
300 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
301 |
|
301 | |||
302 | Actual testing |
|
302 | Actual testing | |
303 | -------------- |
|
303 | -------------- | |
304 |
|
304 | |||
305 | $ testrevs 'desc("C-A0")' |
|
305 | $ testrevs 'desc("C-A0")' | |
306 | ### Matched revisions### |
|
306 | ### Matched revisions### | |
307 | 84fcb0dfe17b: C-A0 |
|
307 | 84fcb0dfe17b: C-A0 | |
308 | ### Relevant markers ### |
|
308 | ### Relevant markers ### | |
309 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
309 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
310 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
310 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
311 | # bundling: 1 changesets found |
|
311 | # bundling: 1 changesets found | |
312 | ### Bundled markers ### |
|
312 | ### Bundled markers ### | |
313 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
313 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
314 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
314 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
315 | ### diff <relevant> <bundled> ### |
|
315 | ### diff <relevant> <bundled> ### | |
316 | ################################# |
|
316 | ################################# | |
317 | ### Exclusive markers ### |
|
317 | ### Exclusive markers ### | |
318 |
|
318 | |||
319 | (The strip markers is considered exclusive to the pruned changeset even if it |
|
319 | (The strip markers is considered exclusive to the pruned changeset even if it | |
320 | is also considered "relevant" to its parent. This allows to strip prune |
|
320 | is also considered "relevant" to its parent. This allows to strip prune | |
321 | markers. This avoid leaving prune markers from dead-end that could be |
|
321 | markers. This avoid leaving prune markers from dead-end that could be | |
322 | problematic) |
|
322 | problematic) | |
323 |
|
323 | |||
324 | $ testrevs 'desc("C-B0")' |
|
324 | $ testrevs 'desc("C-B0")' | |
325 | ### Matched revisions### |
|
325 | ### Matched revisions### | |
326 | 29f93b1df87b: C-B0 |
|
326 | 29f93b1df87b: C-B0 | |
327 | ### Relevant markers ### |
|
327 | ### Relevant markers ### | |
328 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
328 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
329 | # bundling: 1 changesets found |
|
329 | # bundling: 1 changesets found | |
330 | ### Bundled markers ### |
|
330 | ### Bundled markers ### | |
331 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
331 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
332 | ### diff <relevant> <bundled> ### |
|
332 | ### diff <relevant> <bundled> ### | |
333 | ################################# |
|
333 | ################################# | |
334 | ### Exclusive markers ### |
|
334 | ### Exclusive markers ### | |
335 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
335 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
336 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/29f93b1df87b-7fb32101-backup.hg |
|
336 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/29f93b1df87b-7fb32101-backup.hg | |
337 | ### Backup markers ### |
|
337 | ### Backup markers ### | |
338 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
338 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
339 | ### diff <relevant> <backed-up> ### |
|
339 | ### diff <relevant> <backed-up> ### | |
340 | ################################# |
|
340 | ################################# | |
341 | ### Stripped markers ### |
|
341 | ### Stripped markers ### | |
342 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
342 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
343 | ### diff <exclusive> <stripped> ### |
|
343 | ### diff <exclusive> <stripped> ### | |
344 | ################################# |
|
344 | ################################# | |
345 | # unbundling: adding changesets |
|
345 | # unbundling: adding changesets | |
346 | # unbundling: adding manifests |
|
346 | # unbundling: adding manifests | |
347 | # unbundling: adding file changes |
|
347 | # unbundling: adding file changes | |
348 | # unbundling: added 1 changesets with 1 changes to 1 files |
|
348 | # unbundling: added 1 changesets with 1 changes to 1 files | |
349 | # unbundling: 1 new obsolescence markers |
|
349 | # unbundling: 1 new obsolescence markers | |
350 | # unbundling: (1 other changesets obsolete on arrival) |
|
350 | # unbundling: (1 other changesets obsolete on arrival) | |
351 | # unbundling: (run 'hg update' to get a working copy) |
|
351 | # unbundling: (run 'hg update' to get a working copy) | |
352 |
|
352 | |||
353 | $ testrevs 'desc("C-A1")' |
|
353 | $ testrevs 'desc("C-A1")' | |
354 | ### Matched revisions### |
|
354 | ### Matched revisions### | |
355 | cf2c22470d67: C-A1 |
|
355 | cf2c22470d67: C-A1 | |
356 | ### Relevant markers ### |
|
356 | ### Relevant markers ### | |
357 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
357 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
358 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
358 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
359 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
359 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
360 | # bundling: 1 changesets found |
|
360 | # bundling: 1 changesets found | |
361 | ### Bundled markers ### |
|
361 | ### Bundled markers ### | |
362 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
362 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
363 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
363 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
364 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
364 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
365 | ### diff <relevant> <bundled> ### |
|
365 | ### diff <relevant> <bundled> ### | |
366 | ################################# |
|
366 | ################################# | |
367 | ### Exclusive markers ### |
|
367 | ### Exclusive markers ### | |
368 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
368 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
369 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg |
|
369 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |
370 | ### Backup markers ### |
|
370 | ### Backup markers ### | |
371 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
371 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
372 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
372 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
373 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
373 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
374 | ### diff <relevant> <backed-up> ### |
|
374 | ### diff <relevant> <backed-up> ### | |
375 | ################################# |
|
375 | ################################# | |
376 | ### Stripped markers ### |
|
376 | ### Stripped markers ### | |
377 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
377 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
378 | ### diff <exclusive> <stripped> ### |
|
378 | ### diff <exclusive> <stripped> ### | |
379 | ################################# |
|
379 | ################################# | |
380 | # unbundling: adding changesets |
|
380 | # unbundling: adding changesets | |
381 | # unbundling: adding manifests |
|
381 | # unbundling: adding manifests | |
382 | # unbundling: adding file changes |
|
382 | # unbundling: adding file changes | |
383 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
383 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
384 | # unbundling: 1 new obsolescence markers |
|
384 | # unbundling: 1 new obsolescence markers | |
385 | # unbundling: obsoleted 1 changesets |
|
385 | # unbundling: obsoleted 1 changesets | |
386 | # unbundling: new changesets cf2c22470d67 (1 drafts) |
|
386 | # unbundling: new changesets cf2c22470d67 (1 drafts) | |
387 | # unbundling: (run 'hg heads' to see heads) |
|
387 | # unbundling: (run 'hg heads' to see heads) | |
388 |
|
388 | |||
389 | bundling multiple revisions |
|
389 | bundling multiple revisions | |
390 |
|
390 | |||
391 | $ testrevs 'desc("C-A")' |
|
391 | $ testrevs 'desc("C-A")' | |
392 | ### Matched revisions### |
|
392 | ### Matched revisions### | |
393 | 84fcb0dfe17b: C-A0 |
|
393 | 84fcb0dfe17b: C-A0 | |
394 | cf2c22470d67: C-A1 |
|
394 | cf2c22470d67: C-A1 | |
395 | ### Relevant markers ### |
|
395 | ### Relevant markers ### | |
396 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
396 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
397 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
397 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
398 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
398 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
399 | # bundling: 2 changesets found |
|
399 | # bundling: 2 changesets found | |
400 | ### Bundled markers ### |
|
400 | ### Bundled markers ### | |
401 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
401 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
402 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
402 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
403 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
403 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
404 | ### diff <relevant> <bundled> ### |
|
404 | ### diff <relevant> <bundled> ### | |
405 | ################################# |
|
405 | ################################# | |
406 | ### Exclusive markers ### |
|
406 | ### Exclusive markers ### | |
407 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
407 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
408 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
408 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
409 |
|
409 | |||
410 | $ testrevs 'desc("C-")' |
|
410 | $ testrevs 'desc("C-")' | |
411 | ### Matched revisions### |
|
411 | ### Matched revisions### | |
412 | 29f93b1df87b: C-B0 |
|
412 | 29f93b1df87b: C-B0 | |
413 | 84fcb0dfe17b: C-A0 |
|
413 | 84fcb0dfe17b: C-A0 | |
414 | cf2c22470d67: C-A1 |
|
414 | cf2c22470d67: C-A1 | |
415 | ### Relevant markers ### |
|
415 | ### Relevant markers ### | |
416 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
416 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
417 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
417 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
418 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
418 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
419 | # bundling: 3 changesets found |
|
419 | # bundling: 3 changesets found | |
420 | ### Bundled markers ### |
|
420 | ### Bundled markers ### | |
421 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
421 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
422 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
422 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
423 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
423 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
424 | ### diff <relevant> <bundled> ### |
|
424 | ### diff <relevant> <bundled> ### | |
425 | ################################# |
|
425 | ################################# | |
426 | ### Exclusive markers ### |
|
426 | ### Exclusive markers ### | |
427 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
427 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
428 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
428 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
429 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
429 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
430 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-884c33b0-backup.hg |
|
430 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-884c33b0-backup.hg | |
431 | ### Backup markers ### |
|
431 | ### Backup markers ### | |
432 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
432 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
433 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
433 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
434 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
434 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
435 | ### diff <relevant> <backed-up> ### |
|
435 | ### diff <relevant> <backed-up> ### | |
436 | ################################# |
|
436 | ################################# | |
437 | ### Stripped markers ### |
|
437 | ### Stripped markers ### | |
438 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
438 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
439 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
439 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
440 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
440 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
441 | ### diff <exclusive> <stripped> ### |
|
441 | ### diff <exclusive> <stripped> ### | |
442 | ################################# |
|
442 | ################################# | |
443 | # unbundling: adding changesets |
|
443 | # unbundling: adding changesets | |
444 | # unbundling: adding manifests |
|
444 | # unbundling: adding manifests | |
445 | # unbundling: adding file changes |
|
445 | # unbundling: adding file changes | |
446 | # unbundling: added 3 changesets with 3 changes to 3 files (+1 heads) |
|
446 | # unbundling: added 3 changesets with 3 changes to 3 files (+1 heads) | |
447 | # unbundling: 3 new obsolescence markers |
|
447 | # unbundling: 3 new obsolescence markers | |
448 | # unbundling: new changesets cf2c22470d67 (1 drafts) |
|
448 | # unbundling: new changesets cf2c22470d67 (1 drafts) | |
449 | # unbundling: (2 other changesets obsolete on arrival) |
|
449 | # unbundling: (2 other changesets obsolete on arrival) | |
450 | # unbundling: (run 'hg heads' to see heads) |
|
450 | # unbundling: (run 'hg heads' to see heads) | |
451 |
|
451 | |||
452 | chain with precursors also pruned |
|
452 | chain with precursors also pruned | |
453 | ================================= |
|
453 | ================================= | |
454 |
|
454 | |||
455 | . A0 (also pruned) |
|
455 | . A0 (also pruned) | |
456 | . β ΓΈβ β A1 |
|
456 | . β ΓΈβ β A1 | |
457 | . | |
|
457 | . | | |
458 | . β |
|
458 | . β | |
459 |
|
459 | |||
460 | setup |
|
460 | setup | |
461 | ----- |
|
461 | ----- | |
462 |
|
462 | |||
463 | $ mktestrepo prune-inline |
|
463 | $ mktestrepo prune-inline | |
464 | $ mkcommit 'C-A0' |
|
464 | $ mkcommit 'C-A0' | |
465 | $ hg up 'desc("ROOT")' |
|
465 | $ hg up 'desc("ROOT")' | |
466 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
466 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
467 | $ mkcommit 'C-A1' |
|
467 | $ mkcommit 'C-A1' | |
468 | created new head |
|
468 | created new head | |
469 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
469 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
470 | 1 new obsolescence markers |
|
470 | 1 new obsolescence markers | |
471 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
471 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
472 | 1 new obsolescence markers |
|
472 | 1 new obsolescence markers | |
473 | obsoleted 1 changesets |
|
473 | obsoleted 1 changesets | |
474 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
474 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
475 | 1 new obsolescence markers |
|
475 | 1 new obsolescence markers | |
476 | $ hg up 'desc("ROOT")' |
|
476 | $ hg up 'desc("ROOT")' | |
477 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
477 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
478 | $ hg log --hidden -G |
|
478 | $ hg log --hidden -G | |
479 | o cf2c22470d67: C-A1 |
|
479 | o cf2c22470d67: C-A1 | |
480 | | |
|
480 | | | |
481 | | x 84fcb0dfe17b: C-A0 |
|
481 | | x 84fcb0dfe17b: C-A0 | |
482 | |/ |
|
482 | |/ | |
483 | @ ea207398892e: ROOT |
|
483 | @ ea207398892e: ROOT | |
484 |
|
484 | |||
485 | $ hg debugobsolete |
|
485 | $ hg debugobsolete | |
486 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
486 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
487 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
487 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
488 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
488 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
489 |
|
489 | |||
490 | Actual testing |
|
490 | Actual testing | |
491 | -------------- |
|
491 | -------------- | |
492 |
|
492 | |||
493 | $ testrevs 'desc("C-A0")' |
|
493 | $ testrevs 'desc("C-A0")' | |
494 | ### Matched revisions### |
|
494 | ### Matched revisions### | |
495 | 84fcb0dfe17b: C-A0 |
|
495 | 84fcb0dfe17b: C-A0 | |
496 | ### Relevant markers ### |
|
496 | ### Relevant markers ### | |
497 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
497 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
498 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
498 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
499 | # bundling: 1 changesets found |
|
499 | # bundling: 1 changesets found | |
500 | ### Bundled markers ### |
|
500 | ### Bundled markers ### | |
501 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
501 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
502 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
502 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
503 | ### diff <relevant> <bundled> ### |
|
503 | ### diff <relevant> <bundled> ### | |
504 | ################################# |
|
504 | ################################# | |
505 | ### Exclusive markers ### |
|
505 | ### Exclusive markers ### | |
506 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg |
|
506 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg | |
507 | ### Backup markers ### |
|
507 | ### Backup markers ### | |
508 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
508 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
509 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
509 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
510 | ### diff <relevant> <backed-up> ### |
|
510 | ### diff <relevant> <backed-up> ### | |
511 | ################################# |
|
511 | ################################# | |
512 | ### Stripped markers ### |
|
512 | ### Stripped markers ### | |
513 | ### diff <exclusive> <stripped> ### |
|
513 | ### diff <exclusive> <stripped> ### | |
514 | ################################# |
|
514 | ################################# | |
515 | # unbundling: adding changesets |
|
515 | # unbundling: adding changesets | |
516 | # unbundling: adding manifests |
|
516 | # unbundling: adding manifests | |
517 | # unbundling: adding file changes |
|
517 | # unbundling: adding file changes | |
518 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
518 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
519 | # unbundling: (1 other changesets obsolete on arrival) |
|
519 | # unbundling: (1 other changesets obsolete on arrival) | |
520 | # unbundling: (run 'hg heads' to see heads) |
|
520 | # unbundling: (run 'hg heads' to see heads) | |
521 |
|
521 | |||
522 | $ testrevs 'desc("C-A1")' |
|
522 | $ testrevs 'desc("C-A1")' | |
523 | ### Matched revisions### |
|
523 | ### Matched revisions### | |
524 | cf2c22470d67: C-A1 |
|
524 | cf2c22470d67: C-A1 | |
525 | ### Relevant markers ### |
|
525 | ### Relevant markers ### | |
526 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
526 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
527 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
527 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
528 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
528 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
529 | # bundling: 1 changesets found |
|
529 | # bundling: 1 changesets found | |
530 | ### Bundled markers ### |
|
530 | ### Bundled markers ### | |
531 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
531 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
532 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
532 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
533 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
533 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
534 | ### diff <relevant> <bundled> ### |
|
534 | ### diff <relevant> <bundled> ### | |
535 | ################################# |
|
535 | ################################# | |
536 | ### Exclusive markers ### |
|
536 | ### Exclusive markers ### | |
537 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
537 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
538 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg |
|
538 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |
539 | ### Backup markers ### |
|
539 | ### Backup markers ### | |
540 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
540 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
541 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
541 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
542 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
542 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
543 | ### diff <relevant> <backed-up> ### |
|
543 | ### diff <relevant> <backed-up> ### | |
544 | ################################# |
|
544 | ################################# | |
545 | ### Stripped markers ### |
|
545 | ### Stripped markers ### | |
546 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
546 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
547 | ### diff <exclusive> <stripped> ### |
|
547 | ### diff <exclusive> <stripped> ### | |
548 | ################################# |
|
548 | ################################# | |
549 | # unbundling: adding changesets |
|
549 | # unbundling: adding changesets | |
550 | # unbundling: adding manifests |
|
550 | # unbundling: adding manifests | |
551 | # unbundling: adding file changes |
|
551 | # unbundling: adding file changes | |
552 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
552 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
553 | # unbundling: 1 new obsolescence markers |
|
553 | # unbundling: 1 new obsolescence markers | |
554 | # unbundling: new changesets cf2c22470d67 (1 drafts) |
|
554 | # unbundling: new changesets cf2c22470d67 (1 drafts) | |
555 | # unbundling: (run 'hg heads' to see heads) |
|
555 | # unbundling: (run 'hg heads' to see heads) | |
556 |
|
556 | |||
557 | $ testrevs 'desc("C-A")' |
|
557 | $ testrevs 'desc("C-A")' | |
558 | ### Matched revisions### |
|
558 | ### Matched revisions### | |
559 | 84fcb0dfe17b: C-A0 |
|
559 | 84fcb0dfe17b: C-A0 | |
560 | cf2c22470d67: C-A1 |
|
560 | cf2c22470d67: C-A1 | |
561 | ### Relevant markers ### |
|
561 | ### Relevant markers ### | |
562 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
562 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
563 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
563 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
564 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
564 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
565 | # bundling: 2 changesets found |
|
565 | # bundling: 2 changesets found | |
566 | ### Bundled markers ### |
|
566 | ### Bundled markers ### | |
567 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
567 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
568 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
568 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
569 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
569 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
570 | ### diff <relevant> <bundled> ### |
|
570 | ### diff <relevant> <bundled> ### | |
571 | ################################# |
|
571 | ################################# | |
572 | ### Exclusive markers ### |
|
572 | ### Exclusive markers ### | |
573 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
573 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
574 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
574 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
575 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
575 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
576 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg |
|
576 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg | |
577 | ### Backup markers ### |
|
577 | ### Backup markers ### | |
578 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
578 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
579 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
579 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
580 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
580 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
581 | ### diff <relevant> <backed-up> ### |
|
581 | ### diff <relevant> <backed-up> ### | |
582 | ################################# |
|
582 | ################################# | |
583 | ### Stripped markers ### |
|
583 | ### Stripped markers ### | |
584 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
584 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
585 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
585 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
586 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
586 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
587 | ### diff <exclusive> <stripped> ### |
|
587 | ### diff <exclusive> <stripped> ### | |
588 | ################################# |
|
588 | ################################# | |
589 | # unbundling: adding changesets |
|
589 | # unbundling: adding changesets | |
590 | # unbundling: adding manifests |
|
590 | # unbundling: adding manifests | |
591 | # unbundling: adding file changes |
|
591 | # unbundling: adding file changes | |
592 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) |
|
592 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) | |
593 | # unbundling: 3 new obsolescence markers |
|
593 | # unbundling: 3 new obsolescence markers | |
594 | # unbundling: new changesets cf2c22470d67 (1 drafts) |
|
594 | # unbundling: new changesets cf2c22470d67 (1 drafts) | |
595 | # unbundling: (1 other changesets obsolete on arrival) |
|
595 | # unbundling: (1 other changesets obsolete on arrival) | |
596 | # unbundling: (run 'hg heads' to see heads) |
|
596 | # unbundling: (run 'hg heads' to see heads) | |
597 |
|
597 | |||
598 | chain with missing prune |
|
598 | chain with missing prune | |
599 | ======================== |
|
599 | ======================== | |
600 |
|
600 | |||
601 | . β B |
|
601 | . β B | |
602 | . | |
|
602 | . | | |
603 | . β ββ β A1 |
|
603 | . β ββ β A1 | |
604 | . | |
|
604 | . | | |
605 | . β |
|
605 | . β | |
606 |
|
606 | |||
607 | setup |
|
607 | setup | |
608 | ----- |
|
608 | ----- | |
609 |
|
609 | |||
610 | $ mktestrepo missing-prune |
|
610 | $ mktestrepo missing-prune | |
611 | $ mkcommit 'C-A0' |
|
611 | $ mkcommit 'C-A0' | |
612 | $ mkcommit 'C-B0' |
|
612 | $ mkcommit 'C-B0' | |
613 | $ hg up 'desc("ROOT")' |
|
613 | $ hg up 'desc("ROOT")' | |
614 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
614 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
615 | $ mkcommit 'C-A1' |
|
615 | $ mkcommit 'C-A1' | |
616 | created new head |
|
616 | created new head | |
617 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
617 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
618 | 1 new obsolescence markers |
|
618 | 1 new obsolescence markers | |
619 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
619 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
620 | 1 new obsolescence markers |
|
620 | 1 new obsolescence markers | |
621 | obsoleted 1 changesets |
|
621 | obsoleted 1 changesets | |
622 | 1 new orphan changesets |
|
622 | 1 new orphan changesets | |
623 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
623 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
624 | 1 new obsolescence markers |
|
624 | 1 new obsolescence markers | |
625 | obsoleted 1 changesets |
|
625 | obsoleted 1 changesets | |
626 |
|
626 | |||
627 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
627 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
628 |
|
628 | |||
629 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no |
|
629 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no | |
630 |
|
630 | |||
631 | $ hg up 'desc("ROOT")' |
|
631 | $ hg up 'desc("ROOT")' | |
632 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
632 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
633 | $ hg log --hidden -G |
|
633 | $ hg log --hidden -G | |
634 | o cf2c22470d67: C-A1 |
|
634 | o cf2c22470d67: C-A1 | |
635 | | |
|
635 | | | |
636 | @ ea207398892e: ROOT |
|
636 | @ ea207398892e: ROOT | |
637 |
|
637 | |||
638 | $ hg debugobsolete |
|
638 | $ hg debugobsolete | |
639 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
639 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
640 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
640 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
641 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
641 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
642 |
|
642 | |||
643 | Actual testing |
|
643 | Actual testing | |
644 | -------------- |
|
644 | -------------- | |
645 |
|
645 | |||
646 | $ testrevs 'desc("C-A1")' |
|
646 | $ testrevs 'desc("C-A1")' | |
647 | ### Matched revisions### |
|
647 | ### Matched revisions### | |
648 | cf2c22470d67: C-A1 |
|
648 | cf2c22470d67: C-A1 | |
649 | ### Relevant markers ### |
|
649 | ### Relevant markers ### | |
650 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
650 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
651 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
651 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
652 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
652 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
653 | # bundling: 1 changesets found |
|
653 | # bundling: 1 changesets found | |
654 | ### Bundled markers ### |
|
654 | ### Bundled markers ### | |
655 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
655 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
656 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
656 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
657 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
657 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
658 | ### diff <relevant> <bundled> ### |
|
658 | ### diff <relevant> <bundled> ### | |
659 | ################################# |
|
659 | ################################# | |
660 | ### Exclusive markers ### |
|
660 | ### Exclusive markers ### | |
661 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
661 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
662 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
662 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
663 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
663 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
664 | # stripping: saved backup bundle to $TESTTMP/missing-prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg |
|
664 | # stripping: saved backup bundle to $TESTTMP/missing-prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |
665 | ### Backup markers ### |
|
665 | ### Backup markers ### | |
666 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
666 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
667 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
667 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
668 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
668 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
669 | ### diff <relevant> <backed-up> ### |
|
669 | ### diff <relevant> <backed-up> ### | |
670 | ################################# |
|
670 | ################################# | |
671 | ### Stripped markers ### |
|
671 | ### Stripped markers ### | |
672 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
672 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
673 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
673 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
674 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
674 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
675 | ### diff <exclusive> <stripped> ### |
|
675 | ### diff <exclusive> <stripped> ### | |
676 | ################################# |
|
676 | ################################# | |
677 | # unbundling: adding changesets |
|
677 | # unbundling: adding changesets | |
678 | # unbundling: adding manifests |
|
678 | # unbundling: adding manifests | |
679 | # unbundling: adding file changes |
|
679 | # unbundling: adding file changes | |
680 | # unbundling: added 1 changesets with 1 changes to 1 files |
|
680 | # unbundling: added 1 changesets with 1 changes to 1 files | |
681 | # unbundling: 3 new obsolescence markers |
|
681 | # unbundling: 3 new obsolescence markers | |
682 | # unbundling: new changesets cf2c22470d67 (1 drafts) |
|
682 | # unbundling: new changesets cf2c22470d67 (1 drafts) | |
683 | # unbundling: (run 'hg update' to get a working copy) |
|
683 | # unbundling: (run 'hg update' to get a working copy) | |
684 |
|
684 | |||
685 | chain with precursors also pruned |
|
685 | chain with precursors also pruned | |
686 | ================================= |
|
686 | ================================= | |
687 |
|
687 | |||
688 | . A0 (also pruned) |
|
688 | . A0 (also pruned) | |
689 | . β ββ β A1 |
|
689 | . β ββ β A1 | |
690 | . | |
|
690 | . | | |
691 | . β |
|
691 | . β | |
692 |
|
692 | |||
693 | setup |
|
693 | setup | |
694 | ----- |
|
694 | ----- | |
695 |
|
695 | |||
696 | $ mktestrepo prune-inline-missing |
|
696 | $ mktestrepo prune-inline-missing | |
697 | $ mkcommit 'C-A0' |
|
697 | $ mkcommit 'C-A0' | |
698 | $ hg up 'desc("ROOT")' |
|
698 | $ hg up 'desc("ROOT")' | |
699 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
699 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
700 | $ mkcommit 'C-A1' |
|
700 | $ mkcommit 'C-A1' | |
701 | created new head |
|
701 | created new head | |
702 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
702 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
703 | 1 new obsolescence markers |
|
703 | 1 new obsolescence markers | |
704 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
704 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
705 | 1 new obsolescence markers |
|
705 | 1 new obsolescence markers | |
706 | obsoleted 1 changesets |
|
706 | obsoleted 1 changesets | |
707 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
707 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
708 | 1 new obsolescence markers |
|
708 | 1 new obsolescence markers | |
709 |
|
709 | |||
710 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
710 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
711 |
|
711 | |||
712 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no |
|
712 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no | |
713 |
|
713 | |||
714 | $ hg up 'desc("ROOT")' |
|
714 | $ hg up 'desc("ROOT")' | |
715 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
715 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
716 | $ hg log --hidden -G |
|
716 | $ hg log --hidden -G | |
717 | o cf2c22470d67: C-A1 |
|
717 | o cf2c22470d67: C-A1 | |
718 | | |
|
718 | | | |
719 | @ ea207398892e: ROOT |
|
719 | @ ea207398892e: ROOT | |
720 |
|
720 | |||
721 | $ hg debugobsolete |
|
721 | $ hg debugobsolete | |
722 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
722 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
723 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
723 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
724 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
724 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
725 |
|
725 | |||
726 | Actual testing |
|
726 | Actual testing | |
727 | -------------- |
|
727 | -------------- | |
728 |
|
728 | |||
729 | $ testrevs 'desc("C-A1")' |
|
729 | $ testrevs 'desc("C-A1")' | |
730 | ### Matched revisions### |
|
730 | ### Matched revisions### | |
731 | cf2c22470d67: C-A1 |
|
731 | cf2c22470d67: C-A1 | |
732 | ### Relevant markers ### |
|
732 | ### Relevant markers ### | |
733 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
733 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
734 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
734 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
735 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
735 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
736 | # bundling: 1 changesets found |
|
736 | # bundling: 1 changesets found | |
737 | ### Bundled markers ### |
|
737 | ### Bundled markers ### | |
738 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
738 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
739 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
739 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
740 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
740 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
741 | ### diff <relevant> <bundled> ### |
|
741 | ### diff <relevant> <bundled> ### | |
742 | ################################# |
|
742 | ################################# | |
743 | ### Exclusive markers ### |
|
743 | ### Exclusive markers ### | |
744 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
744 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
745 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
745 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
746 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
746 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
747 | # stripping: saved backup bundle to $TESTTMP/prune-inline-missing/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg |
|
747 | # stripping: saved backup bundle to $TESTTMP/prune-inline-missing/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |
748 | ### Backup markers ### |
|
748 | ### Backup markers ### | |
749 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
749 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
750 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
750 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
751 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
751 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
752 | ### diff <relevant> <backed-up> ### |
|
752 | ### diff <relevant> <backed-up> ### | |
753 | ################################# |
|
753 | ################################# | |
754 | ### Stripped markers ### |
|
754 | ### Stripped markers ### | |
755 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
755 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
756 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
756 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
757 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
757 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
758 | ### diff <exclusive> <stripped> ### |
|
758 | ### diff <exclusive> <stripped> ### | |
759 | ################################# |
|
759 | ################################# | |
760 | # unbundling: adding changesets |
|
760 | # unbundling: adding changesets | |
761 | # unbundling: adding manifests |
|
761 | # unbundling: adding manifests | |
762 | # unbundling: adding file changes |
|
762 | # unbundling: adding file changes | |
763 | # unbundling: added 1 changesets with 1 changes to 1 files |
|
763 | # unbundling: added 1 changesets with 1 changes to 1 files | |
764 | # unbundling: 3 new obsolescence markers |
|
764 | # unbundling: 3 new obsolescence markers | |
765 | # unbundling: new changesets cf2c22470d67 (1 drafts) |
|
765 | # unbundling: new changesets cf2c22470d67 (1 drafts) | |
766 | # unbundling: (run 'hg update' to get a working copy) |
|
766 | # unbundling: (run 'hg update' to get a working copy) | |
767 |
|
767 | |||
768 | Chain with fold and split |
|
768 | Chain with fold and split | |
769 | ========================= |
|
769 | ========================= | |
770 |
|
770 | |||
771 | setup |
|
771 | setup | |
772 | ----- |
|
772 | ----- | |
773 |
|
773 | |||
774 | $ mktestrepo split-fold |
|
774 | $ mktestrepo split-fold | |
775 | $ mkcommit 'C-A' |
|
775 | $ mkcommit 'C-A' | |
776 | $ hg up 'desc("ROOT")' |
|
776 | $ hg up 'desc("ROOT")' | |
777 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
777 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
778 | $ mkcommit 'C-B' |
|
778 | $ mkcommit 'C-B' | |
779 | created new head |
|
779 | created new head | |
780 | $ hg up 'desc("ROOT")' |
|
780 | $ hg up 'desc("ROOT")' | |
781 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
781 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
782 | $ mkcommit 'C-C' |
|
782 | $ mkcommit 'C-C' | |
783 | created new head |
|
783 | created new head | |
784 | $ hg up 'desc("ROOT")' |
|
784 | $ hg up 'desc("ROOT")' | |
785 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
785 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
786 | $ mkcommit 'C-D' |
|
786 | $ mkcommit 'C-D' | |
787 | created new head |
|
787 | created new head | |
788 | $ hg up 'desc("ROOT")' |
|
788 | $ hg up 'desc("ROOT")' | |
789 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
789 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
790 | $ mkcommit 'C-E' |
|
790 | $ mkcommit 'C-E' | |
791 | created new head |
|
791 | created new head | |
792 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` |
|
792 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` | |
793 | 1 new obsolescence markers |
|
793 | 1 new obsolescence markers | |
794 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split |
|
794 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split | |
795 | 1 new obsolescence markers |
|
795 | 1 new obsolescence markers | |
796 | obsoleted 1 changesets |
|
796 | obsoleted 1 changesets | |
797 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
|
797 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent | |
798 | 1 new obsolescence markers |
|
798 | 1 new obsolescence markers | |
799 | 3 new content-divergent changesets |
|
799 | 3 new content-divergent changesets | |
800 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 |
|
800 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 | |
801 | 1 new obsolescence markers |
|
801 | 1 new obsolescence markers | |
802 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` |
|
802 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` | |
803 | 1 new obsolescence markers |
|
803 | 1 new obsolescence markers | |
804 | 1 new content-divergent changesets |
|
804 | 1 new content-divergent changesets | |
805 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` |
|
805 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` | |
806 | 1 new obsolescence markers |
|
806 | 1 new obsolescence markers | |
807 | obsoleted 1 changesets |
|
807 | obsoleted 1 changesets | |
808 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` |
|
808 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` | |
809 | 1 new obsolescence markers |
|
809 | 1 new obsolescence markers | |
810 | obsoleted 1 changesets |
|
810 | obsoleted 1 changesets | |
811 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` |
|
811 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` | |
812 | 1 new obsolescence markers |
|
812 | 1 new obsolescence markers | |
813 | obsoleted 1 changesets |
|
813 | obsoleted 1 changesets | |
814 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` |
|
814 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` | |
815 | 1 new obsolescence markers |
|
815 | 1 new obsolescence markers | |
816 |
|
816 | |||
817 | $ hg up 'desc("ROOT")' |
|
817 | $ hg up 'desc("ROOT")' | |
818 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
818 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
819 | $ hg log --hidden -G |
|
819 | $ hg log --hidden -G | |
820 | o 2f20ff6509f0: C-E |
|
820 | o 2f20ff6509f0: C-E | |
821 | | |
|
821 | | | |
822 | | x 06dc9da25ef0: C-D |
|
822 | | x 06dc9da25ef0: C-D | |
823 | |/ |
|
823 | |/ | |
824 | | x 27ec657ca21d: C-C |
|
824 | | x 27ec657ca21d: C-C | |
825 | |/ |
|
825 | |/ | |
826 | | x a9b9da38ed96: C-B |
|
826 | | x a9b9da38ed96: C-B | |
827 | |/ |
|
827 | |/ | |
828 | | x 9ac430e15fca: C-A |
|
828 | | x 9ac430e15fca: C-A | |
829 | |/ |
|
829 | |/ | |
830 | @ ea207398892e: ROOT |
|
830 | @ ea207398892e: ROOT | |
831 |
|
831 | |||
832 | $ hg debugobsolete |
|
832 | $ hg debugobsolete | |
833 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
833 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
834 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
834 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
835 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
835 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
836 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
836 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
837 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
837 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
838 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
838 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
839 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
839 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
840 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
840 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
841 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
841 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
842 |
|
842 | |||
843 | Actual testing |
|
843 | Actual testing | |
844 | -------------- |
|
844 | -------------- | |
845 |
|
845 | |||
846 | $ testrevs 'desc("C-A")' |
|
846 | $ testrevs 'desc("C-A")' | |
847 | ### Matched revisions### |
|
847 | ### Matched revisions### | |
848 | 9ac430e15fca: C-A |
|
848 | 9ac430e15fca: C-A | |
849 | ### Relevant markers ### |
|
849 | ### Relevant markers ### | |
850 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
850 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
851 | # bundling: 1 changesets found |
|
851 | # bundling: 1 changesets found | |
852 | ### Bundled markers ### |
|
852 | ### Bundled markers ### | |
853 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
853 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
854 | ### diff <relevant> <bundled> ### |
|
854 | ### diff <relevant> <bundled> ### | |
855 | ################################# |
|
855 | ################################# | |
856 | ### Exclusive markers ### |
|
856 | ### Exclusive markers ### | |
857 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-81204eba-backup.hg |
|
857 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-81204eba-backup.hg | |
858 | ### Backup markers ### |
|
858 | ### Backup markers ### | |
859 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
859 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
860 | ### diff <relevant> <backed-up> ### |
|
860 | ### diff <relevant> <backed-up> ### | |
861 | ################################# |
|
861 | ################################# | |
862 | ### Stripped markers ### |
|
862 | ### Stripped markers ### | |
863 | ### diff <exclusive> <stripped> ### |
|
863 | ### diff <exclusive> <stripped> ### | |
864 | ################################# |
|
864 | ################################# | |
865 | # unbundling: adding changesets |
|
865 | # unbundling: adding changesets | |
866 | # unbundling: adding manifests |
|
866 | # unbundling: adding manifests | |
867 | # unbundling: adding file changes |
|
867 | # unbundling: adding file changes | |
868 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
868 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
869 | # unbundling: (1 other changesets obsolete on arrival) |
|
869 | # unbundling: (1 other changesets obsolete on arrival) | |
870 | # unbundling: (run 'hg heads' to see heads) |
|
870 | # unbundling: (run 'hg heads' to see heads) | |
871 |
|
871 | |||
872 | $ testrevs 'desc("C-B")' |
|
872 | $ testrevs 'desc("C-B")' | |
873 | ### Matched revisions### |
|
873 | ### Matched revisions### | |
874 | a9b9da38ed96: C-B |
|
874 | a9b9da38ed96: C-B | |
875 | ### Relevant markers ### |
|
875 | ### Relevant markers ### | |
876 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
876 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
877 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
877 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
878 | # bundling: 1 changesets found |
|
878 | # bundling: 1 changesets found | |
879 | ### Bundled markers ### |
|
879 | ### Bundled markers ### | |
880 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
880 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
881 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
881 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
882 | ### diff <relevant> <bundled> ### |
|
882 | ### diff <relevant> <bundled> ### | |
883 | ################################# |
|
883 | ################################# | |
884 | ### Exclusive markers ### |
|
884 | ### Exclusive markers ### | |
885 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-7465d6e9-backup.hg |
|
885 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-7465d6e9-backup.hg | |
886 | ### Backup markers ### |
|
886 | ### Backup markers ### | |
887 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
887 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
888 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
888 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
889 | ### diff <relevant> <backed-up> ### |
|
889 | ### diff <relevant> <backed-up> ### | |
890 | ################################# |
|
890 | ################################# | |
891 | ### Stripped markers ### |
|
891 | ### Stripped markers ### | |
892 | ### diff <exclusive> <stripped> ### |
|
892 | ### diff <exclusive> <stripped> ### | |
893 | ################################# |
|
893 | ################################# | |
894 | # unbundling: adding changesets |
|
894 | # unbundling: adding changesets | |
895 | # unbundling: adding manifests |
|
895 | # unbundling: adding manifests | |
896 | # unbundling: adding file changes |
|
896 | # unbundling: adding file changes | |
897 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
897 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
898 | # unbundling: (1 other changesets obsolete on arrival) |
|
898 | # unbundling: (1 other changesets obsolete on arrival) | |
899 | # unbundling: (run 'hg heads' to see heads) |
|
899 | # unbundling: (run 'hg heads' to see heads) | |
900 |
|
900 | |||
901 | $ testrevs 'desc("C-C")' |
|
901 | $ testrevs 'desc("C-C")' | |
902 | ### Matched revisions### |
|
902 | ### Matched revisions### | |
903 | 27ec657ca21d: C-C |
|
903 | 27ec657ca21d: C-C | |
904 | ### Relevant markers ### |
|
904 | ### Relevant markers ### | |
905 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
905 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
906 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
906 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
907 | # bundling: 1 changesets found |
|
907 | # bundling: 1 changesets found | |
908 | ### Bundled markers ### |
|
908 | ### Bundled markers ### | |
909 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
909 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
910 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
910 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
911 | ### diff <relevant> <bundled> ### |
|
911 | ### diff <relevant> <bundled> ### | |
912 | ################################# |
|
912 | ################################# | |
913 | ### Exclusive markers ### |
|
913 | ### Exclusive markers ### | |
914 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/27ec657ca21d-d5dd1c7c-backup.hg |
|
914 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/27ec657ca21d-d5dd1c7c-backup.hg | |
915 | ### Backup markers ### |
|
915 | ### Backup markers ### | |
916 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
916 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
917 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
917 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
918 | ### diff <relevant> <backed-up> ### |
|
918 | ### diff <relevant> <backed-up> ### | |
919 | ################################# |
|
919 | ################################# | |
920 | ### Stripped markers ### |
|
920 | ### Stripped markers ### | |
921 | ### diff <exclusive> <stripped> ### |
|
921 | ### diff <exclusive> <stripped> ### | |
922 | ################################# |
|
922 | ################################# | |
923 | # unbundling: adding changesets |
|
923 | # unbundling: adding changesets | |
924 | # unbundling: adding manifests |
|
924 | # unbundling: adding manifests | |
925 | # unbundling: adding file changes |
|
925 | # unbundling: adding file changes | |
926 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
926 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
927 | # unbundling: (1 other changesets obsolete on arrival) |
|
927 | # unbundling: (1 other changesets obsolete on arrival) | |
928 | # unbundling: (run 'hg heads' to see heads) |
|
928 | # unbundling: (run 'hg heads' to see heads) | |
929 |
|
929 | |||
930 | $ testrevs 'desc("C-D")' |
|
930 | $ testrevs 'desc("C-D")' | |
931 | ### Matched revisions### |
|
931 | ### Matched revisions### | |
932 | 06dc9da25ef0: C-D |
|
932 | 06dc9da25ef0: C-D | |
933 | ### Relevant markers ### |
|
933 | ### Relevant markers ### | |
934 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
934 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
935 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
935 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
936 | # bundling: 1 changesets found |
|
936 | # bundling: 1 changesets found | |
937 | ### Bundled markers ### |
|
937 | ### Bundled markers ### | |
938 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
938 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
939 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
939 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
940 | ### diff <relevant> <bundled> ### |
|
940 | ### diff <relevant> <bundled> ### | |
941 | ################################# |
|
941 | ################################# | |
942 | ### Exclusive markers ### |
|
942 | ### Exclusive markers ### | |
943 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/06dc9da25ef0-9b1c0a91-backup.hg |
|
943 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/06dc9da25ef0-9b1c0a91-backup.hg | |
944 | ### Backup markers ### |
|
944 | ### Backup markers ### | |
945 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
945 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
946 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
946 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
947 | ### diff <relevant> <backed-up> ### |
|
947 | ### diff <relevant> <backed-up> ### | |
948 | ################################# |
|
948 | ################################# | |
949 | ### Stripped markers ### |
|
949 | ### Stripped markers ### | |
950 | ### diff <exclusive> <stripped> ### |
|
950 | ### diff <exclusive> <stripped> ### | |
951 | ################################# |
|
951 | ################################# | |
952 | # unbundling: adding changesets |
|
952 | # unbundling: adding changesets | |
953 | # unbundling: adding manifests |
|
953 | # unbundling: adding manifests | |
954 | # unbundling: adding file changes |
|
954 | # unbundling: adding file changes | |
955 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
955 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
956 | # unbundling: (1 other changesets obsolete on arrival) |
|
956 | # unbundling: (1 other changesets obsolete on arrival) | |
957 | # unbundling: (run 'hg heads' to see heads) |
|
957 | # unbundling: (run 'hg heads' to see heads) | |
958 |
|
958 | |||
959 | $ testrevs 'desc("C-E")' |
|
959 | $ testrevs 'desc("C-E")' | |
960 | ### Matched revisions### |
|
960 | ### Matched revisions### | |
961 | 2f20ff6509f0: C-E |
|
961 | 2f20ff6509f0: C-E | |
962 | ### Relevant markers ### |
|
962 | ### Relevant markers ### | |
963 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
963 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
964 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
964 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
965 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
965 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
966 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
966 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
967 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
967 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
968 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
968 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
969 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
969 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
970 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
970 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
971 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
971 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
972 | # bundling: 1 changesets found |
|
972 | # bundling: 1 changesets found | |
973 | ### Bundled markers ### |
|
973 | ### Bundled markers ### | |
974 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
974 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
975 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
975 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
976 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
976 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
977 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
977 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
978 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
978 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
979 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
979 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
980 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
980 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
981 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
981 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
982 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
982 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
983 | ### diff <relevant> <bundled> ### |
|
983 | ### diff <relevant> <bundled> ### | |
984 | ################################# |
|
984 | ################################# | |
985 | ### Exclusive markers ### |
|
985 | ### Exclusive markers ### | |
986 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
986 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
987 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
987 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
988 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
988 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
989 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
989 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
990 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
990 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
991 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
991 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
992 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg |
|
992 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg | |
993 | 3 new content-divergent changesets |
|
993 | 3 new content-divergent changesets | |
994 | ### Backup markers ### |
|
994 | ### Backup markers ### | |
995 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
995 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
996 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
996 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
997 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
997 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
998 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
998 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
999 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
999 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1000 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1000 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1001 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1001 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1002 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1002 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1003 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1003 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1004 | ### diff <relevant> <backed-up> ### |
|
1004 | ### diff <relevant> <backed-up> ### | |
1005 | ################################# |
|
1005 | ################################# | |
1006 | ### Stripped markers ### |
|
1006 | ### Stripped markers ### | |
1007 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1007 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1008 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1008 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1009 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1009 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1010 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1010 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1011 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1011 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1012 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1012 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1013 | ### diff <exclusive> <stripped> ### |
|
1013 | ### diff <exclusive> <stripped> ### | |
1014 | ################################# |
|
1014 | ################################# | |
1015 | # unbundling: adding changesets |
|
1015 | # unbundling: adding changesets | |
1016 | # unbundling: adding manifests |
|
1016 | # unbundling: adding manifests | |
1017 | # unbundling: adding file changes |
|
1017 | # unbundling: adding file changes | |
1018 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
1018 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
1019 | # unbundling: 6 new obsolescence markers |
|
1019 | # unbundling: 6 new obsolescence markers | |
1020 | # unbundling: obsoleted 3 changesets |
|
1020 | # unbundling: obsoleted 3 changesets | |
1021 | # unbundling: new changesets 2f20ff6509f0 (1 drafts) |
|
1021 | # unbundling: new changesets 2f20ff6509f0 (1 drafts) | |
1022 | # unbundling: (run 'hg heads' to see heads) |
|
1022 | # unbundling: (run 'hg heads' to see heads) | |
1023 |
|
1023 | |||
1024 | Bundle multiple revisions |
|
1024 | Bundle multiple revisions | |
1025 |
|
1025 | |||
1026 | * each part of the split |
|
1026 | * each part of the split | |
1027 |
|
1027 | |||
1028 | $ testrevs 'desc("C-B") + desc("C-C")' |
|
1028 | $ testrevs 'desc("C-B") + desc("C-C")' | |
1029 | ### Matched revisions### |
|
1029 | ### Matched revisions### | |
1030 | 27ec657ca21d: C-C |
|
1030 | 27ec657ca21d: C-C | |
1031 | a9b9da38ed96: C-B |
|
1031 | a9b9da38ed96: C-B | |
1032 | ### Relevant markers ### |
|
1032 | ### Relevant markers ### | |
1033 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1033 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1034 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1034 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1035 | # bundling: 2 changesets found |
|
1035 | # bundling: 2 changesets found | |
1036 | ### Bundled markers ### |
|
1036 | ### Bundled markers ### | |
1037 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1037 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1038 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1038 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1039 | ### diff <relevant> <bundled> ### |
|
1039 | ### diff <relevant> <bundled> ### | |
1040 | ################################# |
|
1040 | ################################# | |
1041 | ### Exclusive markers ### |
|
1041 | ### Exclusive markers ### | |
1042 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-0daf625a-backup.hg |
|
1042 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-0daf625a-backup.hg | |
1043 | ### Backup markers ### |
|
1043 | ### Backup markers ### | |
1044 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1044 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1045 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1045 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1046 | ### diff <relevant> <backed-up> ### |
|
1046 | ### diff <relevant> <backed-up> ### | |
1047 | ################################# |
|
1047 | ################################# | |
1048 | ### Stripped markers ### |
|
1048 | ### Stripped markers ### | |
1049 | ### diff <exclusive> <stripped> ### |
|
1049 | ### diff <exclusive> <stripped> ### | |
1050 | ################################# |
|
1050 | ################################# | |
1051 | # unbundling: adding changesets |
|
1051 | # unbundling: adding changesets | |
1052 | # unbundling: adding manifests |
|
1052 | # unbundling: adding manifests | |
1053 | # unbundling: adding file changes |
|
1053 | # unbundling: adding file changes | |
1054 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
|
1054 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) | |
1055 | # unbundling: (2 other changesets obsolete on arrival) |
|
1055 | # unbundling: (2 other changesets obsolete on arrival) | |
1056 | # unbundling: (run 'hg heads' to see heads) |
|
1056 | # unbundling: (run 'hg heads' to see heads) | |
1057 |
|
1057 | |||
1058 | * top one and other divergent |
|
1058 | * top one and other divergent | |
1059 |
|
1059 | |||
1060 | $ testrevs 'desc("C-E") + desc("C-D")' |
|
1060 | $ testrevs 'desc("C-E") + desc("C-D")' | |
1061 | ### Matched revisions### |
|
1061 | ### Matched revisions### | |
1062 | 06dc9da25ef0: C-D |
|
1062 | 06dc9da25ef0: C-D | |
1063 | 2f20ff6509f0: C-E |
|
1063 | 2f20ff6509f0: C-E | |
1064 | ### Relevant markers ### |
|
1064 | ### Relevant markers ### | |
1065 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1065 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1066 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1066 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1067 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1067 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1068 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1068 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1069 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1069 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1070 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1070 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1071 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1071 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1072 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1072 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1073 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1073 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1074 | # bundling: 2 changesets found |
|
1074 | # bundling: 2 changesets found | |
1075 | ### Bundled markers ### |
|
1075 | ### Bundled markers ### | |
1076 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1076 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1077 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1077 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1078 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1078 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1079 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1079 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1080 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1080 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1081 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1081 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1082 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1082 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1083 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1083 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1084 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1084 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1085 | ### diff <relevant> <bundled> ### |
|
1085 | ### diff <relevant> <bundled> ### | |
1086 | ################################# |
|
1086 | ################################# | |
1087 | ### Exclusive markers ### |
|
1087 | ### Exclusive markers ### | |
1088 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1088 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1089 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1089 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1090 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1090 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1091 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1091 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1092 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1092 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1093 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1093 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1094 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1094 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1095 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-bf1b80f4-backup.hg |
|
1095 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-bf1b80f4-backup.hg | |
1096 | ### Backup markers ### |
|
1096 | ### Backup markers ### | |
1097 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1097 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1098 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1098 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1099 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1099 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1100 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1100 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1101 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1101 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1102 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1102 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1103 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1103 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1104 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1104 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1105 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1105 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1106 | ### diff <relevant> <backed-up> ### |
|
1106 | ### diff <relevant> <backed-up> ### | |
1107 | ################################# |
|
1107 | ################################# | |
1108 | ### Stripped markers ### |
|
1108 | ### Stripped markers ### | |
1109 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1109 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1110 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1110 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1111 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1111 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1112 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1112 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1113 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1113 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1114 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1114 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1115 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1115 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1116 | ### diff <exclusive> <stripped> ### |
|
1116 | ### diff <exclusive> <stripped> ### | |
1117 | ################################# |
|
1117 | ################################# | |
1118 | # unbundling: adding changesets |
|
1118 | # unbundling: adding changesets | |
1119 | # unbundling: adding manifests |
|
1119 | # unbundling: adding manifests | |
1120 | # unbundling: adding file changes |
|
1120 | # unbundling: adding file changes | |
1121 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
|
1121 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) | |
1122 | # unbundling: 7 new obsolescence markers |
|
1122 | # unbundling: 7 new obsolescence markers | |
1123 | # unbundling: obsoleted 2 changesets |
|
1123 | # unbundling: obsoleted 2 changesets | |
1124 | # unbundling: new changesets 2f20ff6509f0 (1 drafts) |
|
1124 | # unbundling: new changesets 2f20ff6509f0 (1 drafts) | |
1125 | # unbundling: (1 other changesets obsolete on arrival) |
|
1125 | # unbundling: (1 other changesets obsolete on arrival) | |
1126 | # unbundling: (run 'hg heads' to see heads) |
|
1126 | # unbundling: (run 'hg heads' to see heads) | |
1127 |
|
1127 | |||
1128 | * top one and initial precursors |
|
1128 | * top one and initial precursors | |
1129 |
|
1129 | |||
1130 | $ testrevs 'desc("C-E") + desc("C-A")' |
|
1130 | $ testrevs 'desc("C-E") + desc("C-A")' | |
1131 | ### Matched revisions### |
|
1131 | ### Matched revisions### | |
1132 | 2f20ff6509f0: C-E |
|
1132 | 2f20ff6509f0: C-E | |
1133 | 9ac430e15fca: C-A |
|
1133 | 9ac430e15fca: C-A | |
1134 | ### Relevant markers ### |
|
1134 | ### Relevant markers ### | |
1135 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1135 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1136 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1136 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1137 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1137 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1138 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1138 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1139 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1139 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1140 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1140 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1141 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1141 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1142 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1142 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1143 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1143 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1144 | # bundling: 2 changesets found |
|
1144 | # bundling: 2 changesets found | |
1145 | ### Bundled markers ### |
|
1145 | ### Bundled markers ### | |
1146 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1146 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1147 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1147 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1148 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1148 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1149 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1149 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1150 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1150 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1151 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1151 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1152 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1152 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1153 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1153 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1154 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1154 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1155 | ### diff <relevant> <bundled> ### |
|
1155 | ### diff <relevant> <bundled> ### | |
1156 | ################################# |
|
1156 | ################################# | |
1157 | ### Exclusive markers ### |
|
1157 | ### Exclusive markers ### | |
1158 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1158 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1159 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1159 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1160 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1160 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1161 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1161 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1162 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1162 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1163 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1163 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1164 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg |
|
1164 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg | |
1165 | 3 new content-divergent changesets |
|
1165 | 3 new content-divergent changesets | |
1166 | ### Backup markers ### |
|
1166 | ### Backup markers ### | |
1167 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1167 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1168 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1168 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1169 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1169 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1170 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1170 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1171 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1171 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1172 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1172 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1173 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1173 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1174 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1174 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1175 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1175 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1176 | ### diff <relevant> <backed-up> ### |
|
1176 | ### diff <relevant> <backed-up> ### | |
1177 | ################################# |
|
1177 | ################################# | |
1178 | ### Stripped markers ### |
|
1178 | ### Stripped markers ### | |
1179 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1179 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1180 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1180 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1181 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1181 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1182 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1182 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1183 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1183 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1184 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1184 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1185 | ### diff <exclusive> <stripped> ### |
|
1185 | ### diff <exclusive> <stripped> ### | |
1186 | ################################# |
|
1186 | ################################# | |
1187 | # unbundling: adding changesets |
|
1187 | # unbundling: adding changesets | |
1188 | # unbundling: adding manifests |
|
1188 | # unbundling: adding manifests | |
1189 | # unbundling: adding file changes |
|
1189 | # unbundling: adding file changes | |
1190 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
|
1190 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) | |
1191 | # unbundling: 6 new obsolescence markers |
|
1191 | # unbundling: 6 new obsolescence markers | |
1192 | # unbundling: obsoleted 3 changesets |
|
1192 | # unbundling: obsoleted 3 changesets | |
1193 | # unbundling: new changesets 2f20ff6509f0 (1 drafts) |
|
1193 | # unbundling: new changesets 2f20ff6509f0 (1 drafts) | |
1194 | # unbundling: (1 other changesets obsolete on arrival) |
|
1194 | # unbundling: (1 other changesets obsolete on arrival) | |
1195 | # unbundling: (run 'hg heads' to see heads) |
|
1195 | # unbundling: (run 'hg heads' to see heads) | |
1196 |
|
1196 | |||
1197 | * top one and one of the split |
|
1197 | * top one and one of the split | |
1198 |
|
1198 | |||
1199 | $ testrevs 'desc("C-E") + desc("C-C")' |
|
1199 | $ testrevs 'desc("C-E") + desc("C-C")' | |
1200 | ### Matched revisions### |
|
1200 | ### Matched revisions### | |
1201 | 27ec657ca21d: C-C |
|
1201 | 27ec657ca21d: C-C | |
1202 | 2f20ff6509f0: C-E |
|
1202 | 2f20ff6509f0: C-E | |
1203 | ### Relevant markers ### |
|
1203 | ### Relevant markers ### | |
1204 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1204 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1205 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1205 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1206 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1206 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1207 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1207 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1208 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1208 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1209 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1209 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1210 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1210 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1211 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1211 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1212 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1212 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1213 | # bundling: 2 changesets found |
|
1213 | # bundling: 2 changesets found | |
1214 | ### Bundled markers ### |
|
1214 | ### Bundled markers ### | |
1215 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1215 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1216 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1216 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1217 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1217 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1218 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1218 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1219 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1219 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1220 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1220 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1221 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1221 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1222 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1222 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1223 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1223 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1224 | ### diff <relevant> <bundled> ### |
|
1224 | ### diff <relevant> <bundled> ### | |
1225 | ################################# |
|
1225 | ################################# | |
1226 | ### Exclusive markers ### |
|
1226 | ### Exclusive markers ### | |
1227 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1227 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1228 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1228 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1229 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1229 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1230 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1230 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1231 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1231 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1232 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1232 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1233 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1233 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1234 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-5fdfcd7d-backup.hg |
|
1234 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-5fdfcd7d-backup.hg | |
1235 | ### Backup markers ### |
|
1235 | ### Backup markers ### | |
1236 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1236 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1237 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1237 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1238 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1238 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1239 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1239 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1240 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1240 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1241 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1241 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1242 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1242 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1243 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1243 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1244 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1244 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1245 | ### diff <relevant> <backed-up> ### |
|
1245 | ### diff <relevant> <backed-up> ### | |
1246 | ################################# |
|
1246 | ################################# | |
1247 | ### Stripped markers ### |
|
1247 | ### Stripped markers ### | |
1248 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1248 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1249 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1249 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1250 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1250 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1251 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1251 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1252 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1252 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1253 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1253 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1254 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1254 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1255 | ### diff <exclusive> <stripped> ### |
|
1255 | ### diff <exclusive> <stripped> ### | |
1256 | ################################# |
|
1256 | ################################# | |
1257 | # unbundling: adding changesets |
|
1257 | # unbundling: adding changesets | |
1258 | # unbundling: adding manifests |
|
1258 | # unbundling: adding manifests | |
1259 | # unbundling: adding file changes |
|
1259 | # unbundling: adding file changes | |
1260 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
|
1260 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) | |
1261 | # unbundling: 7 new obsolescence markers |
|
1261 | # unbundling: 7 new obsolescence markers | |
1262 | # unbundling: obsoleted 2 changesets |
|
1262 | # unbundling: obsoleted 2 changesets | |
1263 | # unbundling: new changesets 2f20ff6509f0 (1 drafts) |
|
1263 | # unbundling: new changesets 2f20ff6509f0 (1 drafts) | |
1264 | # unbundling: (1 other changesets obsolete on arrival) |
|
1264 | # unbundling: (1 other changesets obsolete on arrival) | |
1265 | # unbundling: (run 'hg heads' to see heads) |
|
1265 | # unbundling: (run 'hg heads' to see heads) | |
1266 |
|
1266 | |||
1267 | * all |
|
1267 | * all | |
1268 |
|
1268 | |||
1269 | $ testrevs 'desc("C-")' |
|
1269 | $ testrevs 'desc("C-")' | |
1270 | ### Matched revisions### |
|
1270 | ### Matched revisions### | |
1271 | 06dc9da25ef0: C-D |
|
1271 | 06dc9da25ef0: C-D | |
1272 | 27ec657ca21d: C-C |
|
1272 | 27ec657ca21d: C-C | |
1273 | 2f20ff6509f0: C-E |
|
1273 | 2f20ff6509f0: C-E | |
1274 | 9ac430e15fca: C-A |
|
1274 | 9ac430e15fca: C-A | |
1275 | a9b9da38ed96: C-B |
|
1275 | a9b9da38ed96: C-B | |
1276 | ### Relevant markers ### |
|
1276 | ### Relevant markers ### | |
1277 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1277 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1278 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1278 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1279 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1279 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1280 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1280 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1281 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1281 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1282 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1282 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1283 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1283 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1284 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1284 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1285 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1285 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1286 | # bundling: 5 changesets found |
|
1286 | # bundling: 5 changesets found | |
1287 | ### Bundled markers ### |
|
1287 | ### Bundled markers ### | |
1288 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1288 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1289 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1289 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1290 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1290 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1291 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1291 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1292 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1292 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1293 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1293 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1294 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1294 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1295 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1295 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1296 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1296 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1297 | ### diff <relevant> <bundled> ### |
|
1297 | ### diff <relevant> <bundled> ### | |
1298 | ################################# |
|
1298 | ################################# | |
1299 | ### Exclusive markers ### |
|
1299 | ### Exclusive markers ### | |
1300 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1300 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1301 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1301 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1302 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1302 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1303 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1303 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1304 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1304 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1305 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1305 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1306 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1306 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1307 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1307 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1308 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1308 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1309 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-eeb4258f-backup.hg |
|
1309 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-eeb4258f-backup.hg | |
1310 | ### Backup markers ### |
|
1310 | ### Backup markers ### | |
1311 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1311 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1312 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1312 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1313 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1313 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1314 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1314 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1315 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1315 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1316 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1316 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1317 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1317 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1318 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1318 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1319 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1319 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1320 | ### diff <relevant> <backed-up> ### |
|
1320 | ### diff <relevant> <backed-up> ### | |
1321 | ################################# |
|
1321 | ################################# | |
1322 | ### Stripped markers ### |
|
1322 | ### Stripped markers ### | |
1323 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1323 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1324 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1324 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1325 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1325 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1326 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1326 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1327 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1327 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1328 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1328 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1329 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1329 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1330 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1330 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1331 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1331 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1332 | ### diff <exclusive> <stripped> ### |
|
1332 | ### diff <exclusive> <stripped> ### | |
1333 | ################################# |
|
1333 | ################################# | |
1334 | # unbundling: adding changesets |
|
1334 | # unbundling: adding changesets | |
1335 | # unbundling: adding manifests |
|
1335 | # unbundling: adding manifests | |
1336 | # unbundling: adding file changes |
|
1336 | # unbundling: adding file changes | |
1337 | # unbundling: added 5 changesets with 5 changes to 5 files (+4 heads) |
|
1337 | # unbundling: added 5 changesets with 5 changes to 5 files (+4 heads) | |
1338 | # unbundling: 9 new obsolescence markers |
|
1338 | # unbundling: 9 new obsolescence markers | |
1339 | # unbundling: new changesets 2f20ff6509f0 (1 drafts) |
|
1339 | # unbundling: new changesets 2f20ff6509f0 (1 drafts) | |
1340 | # unbundling: (4 other changesets obsolete on arrival) |
|
1340 | # unbundling: (4 other changesets obsolete on arrival) | |
1341 | # unbundling: (run 'hg heads' to see heads) |
|
1341 | # unbundling: (run 'hg heads' to see heads) | |
1342 |
|
1342 | |||
1343 | changeset pruned on its own |
|
1343 | changeset pruned on its own | |
1344 | =========================== |
|
1344 | =========================== | |
1345 |
|
1345 | |||
1346 | . β B |
|
1346 | . β B | |
1347 | . | |
|
1347 | . | | |
1348 | . β A |
|
1348 | . β A | |
1349 | . | |
|
1349 | . | | |
1350 | . β |
|
1350 | . β | |
1351 |
|
1351 | |||
1352 | setup |
|
1352 | setup | |
1353 | ----- |
|
1353 | ----- | |
1354 |
|
1354 | |||
1355 | $ mktestrepo lonely-prune |
|
1355 | $ mktestrepo lonely-prune | |
1356 | $ hg up 'desc("ROOT")' |
|
1356 | $ hg up 'desc("ROOT")' | |
1357 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1357 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1358 | $ mkcommit 'C-A' |
|
1358 | $ mkcommit 'C-A' | |
1359 | $ mkcommit 'C-B' |
|
1359 | $ mkcommit 'C-B' | |
1360 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` |
|
1360 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` | |
1361 | 1 new obsolescence markers |
|
1361 | 1 new obsolescence markers | |
1362 | obsoleted 1 changesets |
|
1362 | obsoleted 1 changesets | |
1363 |
|
1363 | |||
1364 | $ hg up 'desc("ROOT")' |
|
1364 | $ hg up 'desc("ROOT")' | |
1365 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1365 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1366 | $ hg log --hidden -G |
|
1366 | $ hg log --hidden -G | |
1367 | x cefb651fc2fd: C-B |
|
1367 | x cefb651fc2fd: C-B | |
1368 | | |
|
1368 | | | |
1369 | o 9ac430e15fca: C-A |
|
1369 | o 9ac430e15fca: C-A | |
1370 | | |
|
1370 | | | |
1371 | @ ea207398892e: ROOT |
|
1371 | @ ea207398892e: ROOT | |
1372 |
|
1372 | |||
1373 | $ hg debugobsolete |
|
1373 | $ hg debugobsolete | |
1374 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1374 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1375 |
|
1375 | |||
1376 | Actual testing |
|
1376 | Actual testing | |
1377 | -------------- |
|
1377 | -------------- | |
1378 | $ testrevs 'desc("C-A")' |
|
1378 | $ testrevs 'desc("C-A")' | |
1379 | ### Matched revisions### |
|
1379 | ### Matched revisions### | |
1380 | 9ac430e15fca: C-A |
|
1380 | 9ac430e15fca: C-A | |
1381 | ### Relevant markers ### |
|
1381 | ### Relevant markers ### | |
1382 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1382 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1383 | # bundling: 1 changesets found |
|
1383 | # bundling: 1 changesets found | |
1384 | ### Bundled markers ### |
|
1384 | ### Bundled markers ### | |
1385 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1385 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1386 | ### diff <relevant> <bundled> ### |
|
1386 | ### diff <relevant> <bundled> ### | |
1387 | ################################# |
|
1387 | ################################# | |
1388 | ### Exclusive markers ### |
|
1388 | ### Exclusive markers ### | |
1389 | $ testrevs 'desc("C-B")' |
|
1389 | $ testrevs 'desc("C-B")' | |
1390 | ### Matched revisions### |
|
1390 | ### Matched revisions### | |
1391 | cefb651fc2fd: C-B |
|
1391 | cefb651fc2fd: C-B | |
1392 | ### Relevant markers ### |
|
1392 | ### Relevant markers ### | |
1393 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1393 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1394 | # bundling: 1 changesets found |
|
1394 | # bundling: 1 changesets found | |
1395 | ### Bundled markers ### |
|
1395 | ### Bundled markers ### | |
1396 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1396 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1397 | ### diff <relevant> <bundled> ### |
|
1397 | ### diff <relevant> <bundled> ### | |
1398 | ################################# |
|
1398 | ################################# | |
1399 | ### Exclusive markers ### |
|
1399 | ### Exclusive markers ### | |
1400 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1400 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1401 | # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/cefb651fc2fd-345c8dfa-backup.hg |
|
1401 | # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/cefb651fc2fd-345c8dfa-backup.hg | |
1402 | ### Backup markers ### |
|
1402 | ### Backup markers ### | |
1403 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1403 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1404 | ### diff <relevant> <backed-up> ### |
|
1404 | ### diff <relevant> <backed-up> ### | |
1405 | ################################# |
|
1405 | ################################# | |
1406 | ### Stripped markers ### |
|
1406 | ### Stripped markers ### | |
1407 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1407 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1408 | ### diff <exclusive> <stripped> ### |
|
1408 | ### diff <exclusive> <stripped> ### | |
1409 | ################################# |
|
1409 | ################################# | |
1410 | # unbundling: adding changesets |
|
1410 | # unbundling: adding changesets | |
1411 | # unbundling: adding manifests |
|
1411 | # unbundling: adding manifests | |
1412 | # unbundling: adding file changes |
|
1412 | # unbundling: adding file changes | |
1413 | # unbundling: added 1 changesets with 1 changes to 1 files |
|
1413 | # unbundling: added 1 changesets with 1 changes to 1 files | |
1414 | # unbundling: 1 new obsolescence markers |
|
1414 | # unbundling: 1 new obsolescence markers | |
1415 | # unbundling: (1 other changesets obsolete on arrival) |
|
1415 | # unbundling: (1 other changesets obsolete on arrival) | |
1416 | # unbundling: (run 'hg update' to get a working copy) |
|
1416 | # unbundling: (run 'hg update' to get a working copy) | |
1417 | $ testrevs 'desc("C-")' |
|
1417 | $ testrevs 'desc("C-")' | |
1418 | ### Matched revisions### |
|
1418 | ### Matched revisions### | |
1419 | 9ac430e15fca: C-A |
|
1419 | 9ac430e15fca: C-A | |
1420 | cefb651fc2fd: C-B |
|
1420 | cefb651fc2fd: C-B | |
1421 | ### Relevant markers ### |
|
1421 | ### Relevant markers ### | |
1422 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1422 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1423 | # bundling: 2 changesets found |
|
1423 | # bundling: 2 changesets found | |
1424 | ### Bundled markers ### |
|
1424 | ### Bundled markers ### | |
1425 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1425 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1426 | ### diff <relevant> <bundled> ### |
|
1426 | ### diff <relevant> <bundled> ### | |
1427 | ################################# |
|
1427 | ################################# | |
1428 | ### Exclusive markers ### |
|
1428 | ### Exclusive markers ### | |
1429 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1429 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1430 | # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/9ac430e15fca-b9855b02-backup.hg |
|
1430 | # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/9ac430e15fca-b9855b02-backup.hg | |
1431 | ### Backup markers ### |
|
1431 | ### Backup markers ### | |
1432 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1432 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1433 | ### diff <relevant> <backed-up> ### |
|
1433 | ### diff <relevant> <backed-up> ### | |
1434 | ################################# |
|
1434 | ################################# | |
1435 | ### Stripped markers ### |
|
1435 | ### Stripped markers ### | |
1436 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1436 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1437 | ### diff <exclusive> <stripped> ### |
|
1437 | ### diff <exclusive> <stripped> ### | |
1438 | ################################# |
|
1438 | ################################# | |
1439 | # unbundling: adding changesets |
|
1439 | # unbundling: adding changesets | |
1440 | # unbundling: adding manifests |
|
1440 | # unbundling: adding manifests | |
1441 | # unbundling: adding file changes |
|
1441 | # unbundling: adding file changes | |
1442 | # unbundling: added 2 changesets with 2 changes to 2 files |
|
1442 | # unbundling: added 2 changesets with 2 changes to 2 files | |
1443 | # unbundling: 1 new obsolescence markers |
|
1443 | # unbundling: 1 new obsolescence markers | |
1444 | # unbundling: new changesets 9ac430e15fca (1 drafts) |
|
1444 | # unbundling: new changesets 9ac430e15fca (1 drafts) | |
1445 | # unbundling: (1 other changesets obsolete on arrival) |
|
1445 | # unbundling: (1 other changesets obsolete on arrival) | |
1446 | # unbundling: (run 'hg update' to get a working copy) |
|
1446 | # unbundling: (run 'hg update' to get a working copy) | |
1447 |
|
1447 | |||
1448 | Test that advisory obsolescence markers in bundles are ignored if unsupported |
|
1448 | Test that advisory obsolescence markers in bundles are ignored if unsupported | |
1449 | ----------------------------------------------------------------------------- |
|
1449 | ----------------------------------------------------------------------------- | |
1450 |
|
1450 | |||
1451 | $ hg init repo-with-obs |
|
1451 | $ hg init repo-with-obs | |
1452 | $ cd repo-with-obs |
|
1452 | $ cd repo-with-obs | |
1453 | $ hg debugbuilddag +1 |
|
1453 | $ hg debugbuilddag +1 | |
1454 | $ hg debugobsolete `getid 0` |
|
1454 | $ hg debugobsolete `getid 0` | |
1455 | 1 new obsolescence markers |
|
1455 | 1 new obsolescence markers | |
1456 | obsoleted 1 changesets |
|
1456 | obsoleted 1 changesets | |
1457 | $ hg bundle --config experimental.evolution.bundle-obsmarker=true --config experimental.evolution.bundle-obsmarker:mandatory=false --all --hidden bundle-with-obs |
|
1457 | $ hg bundle --config experimental.evolution.bundle-obsmarker=true --config experimental.evolution.bundle-obsmarker:mandatory=false --all --hidden bundle-with-obs | |
1458 | 1 changesets found |
|
1458 | 1 changesets found | |
1459 | $ cd .. |
|
1459 | $ cd .. | |
1460 | $ hg init repo-without-obs |
|
1460 | $ hg init repo-without-obs | |
1461 | $ cd repo-without-obs |
|
1461 | $ cd repo-without-obs | |
1462 | $ hg --config experimental.evolution=False unbundle ../repo-with-obs/bundle-with-obs --debug |
|
1462 | $ hg --config experimental.evolution=False unbundle ../repo-with-obs/bundle-with-obs --debug | |
1463 | bundle2-input-bundle: 1 params with-transaction |
|
1463 | bundle2-input-bundle: 1 params with-transaction | |
1464 | bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported |
|
1464 | bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported | |
1465 | adding changesets |
|
1465 | adding changesets | |
1466 | add changeset 1ea73414a91b |
|
1466 | add changeset 1ea73414a91b | |
1467 | adding manifests |
|
1467 | adding manifests | |
1468 | adding file changes |
|
1468 | adding file changes | |
1469 | bundle2-input-part: total payload size 190 |
|
1469 | bundle2-input-part: total payload size 190 | |
1470 | bundle2-input-part: "cache:rev-branch-cache" (advisory) supported |
|
1470 | bundle2-input-part: "cache:rev-branch-cache" (advisory) supported | |
1471 | bundle2-input-part: total payload size 39 |
|
1471 | bundle2-input-part: total payload size 39 | |
1472 | bundle2-input-part: "obsmarkers" (advisory) supported |
|
1472 | bundle2-input-part: "obsmarkers" (advisory) supported | |
1473 | bundle2-input-part: total payload size 50 |
|
1473 | bundle2-input-part: total payload size 50 | |
1474 | ignoring obsolescence markers, feature not enabled |
|
1474 | ignoring obsolescence markers, feature not enabled | |
1475 | bundle2-input-bundle: 3 parts total |
|
1475 | bundle2-input-bundle: 3 parts total | |
1476 | updating the branch cache |
|
1476 | updating the branch cache | |
1477 | added 1 changesets with 0 changes to 0 files |
|
1477 | added 1 changesets with 0 changes to 0 files | |
1478 | new changesets 1ea73414a91b (1 drafts) |
|
1478 | new changesets 1ea73414a91b (1 drafts) | |
1479 | (run 'hg update' to get a working copy) |
|
1479 | (run 'hg update' to get a working copy) | |
1480 | $ cd .. |
|
1480 | $ cd .. | |
1481 |
|
1481 | |||
1482 | Test bundlespec overwrite default |
|
1482 | Test bundlespec overwrite default | |
1483 | --------------------------------- |
|
1483 | --------------------------------- | |
1484 |
|
1484 | |||
1485 | # move back to the default |
|
1485 | # move back to the default | |
1486 |
|
1486 | |||
1487 | $ grep -v evolution.bundle-obsmarker $HGRCPATH > a |
|
1487 | $ grep -v evolution.bundle-obsmarker $HGRCPATH > a | |
1488 | $ mv a $HGRCPATH |
|
1488 | $ mv a $HGRCPATH | |
1489 |
|
1489 | |||
1490 | $ hg bundle -R repo-with-obs --type 'v2;obsolescence=yes' --all --hidden bundle-type-with-obs |
|
1490 | $ hg bundle -R repo-with-obs --type 'v2;obsolescence=yes' --all --hidden bundle-type-with-obs | |
1491 | 1 changesets found |
|
1491 | 1 changesets found | |
1492 | $ hg debugbundle bundle-type-with-obs --part-type obsmarkers |
|
1492 | $ hg debugbundle bundle-type-with-obs --part-type obsmarkers | |
1493 | Stream params: {Compression: BZ} |
|
1493 | Stream params: {Compression: BZ} | |
1494 | obsmarkers -- {} (mandatory: True) |
|
1494 | obsmarkers -- {} (mandatory: True) | |
1495 | version: 1 (50 bytes) |
|
1495 | version: 1 (50 bytes) | |
1496 | 1ea73414a91b0920940797d8fc6a11e447f8ea1e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1496 | 1ea73414a91b0920940797d8fc6a11e447f8ea1e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
1497 | ||||
|
1498 | $ hg bundle -R repo-with-obs --type 'v2;obsolescence=yes;obsolescence-mandatory=no' --all --hidden bundle-type-with-obs-adv | |||
|
1499 | 1 changesets found | |||
|
1500 | $ hg debugbundle bundle-type-with-obs-adv --part-type obsmarkers | |||
|
1501 | Stream params: {Compression: BZ} | |||
|
1502 | obsmarkers -- {} (mandatory: False) | |||
|
1503 | version: 1 (50 bytes) | |||
|
1504 | 1ea73414a91b0920940797d8fc6a11e447f8ea1e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
1497 | $ hg bundle -R repo-with-obs --type 'v2;obsolescence=no' --all --hidden bundle-type-without-obs |
|
1505 | $ hg bundle -R repo-with-obs --type 'v2;obsolescence=no' --all --hidden bundle-type-without-obs | |
1498 | 1 changesets found |
|
1506 | 1 changesets found | |
1499 | $ hg debugbundle bundle-type-without-obs --part-type obsmarkers |
|
1507 | $ hg debugbundle bundle-type-without-obs --part-type obsmarkers | |
1500 | Stream params: {Compression: BZ} |
|
1508 | Stream params: {Compression: BZ} | |
1501 |
|
1509 | |||
1502 | Test bundlespec overwrite local config |
|
1510 | Test bundlespec overwrite local config | |
1503 | -------------------------------------- |
|
1511 | -------------------------------------- | |
1504 |
|
1512 | |||
1505 | $ hg bundle -R repo-with-obs --config experimental.evolution.bundle-obsmarker=false --type 'v2;obsolescence=yes' --all --hidden bundle-type-with-obs2 |
|
1513 | $ hg bundle -R repo-with-obs --config experimental.evolution.bundle-obsmarker=false --type 'v2;obsolescence=yes' --all --hidden bundle-type-with-obs2 | |
1506 | 1 changesets found |
|
1514 | 1 changesets found | |
1507 | $ hg debugbundle bundle-type-with-obs2 --part-type obsmarkers |
|
1515 | $ hg debugbundle bundle-type-with-obs2 --part-type obsmarkers | |
1508 | Stream params: {Compression: BZ} |
|
1516 | Stream params: {Compression: BZ} | |
1509 | obsmarkers -- {} (mandatory: True) |
|
1517 | obsmarkers -- {} (mandatory: True) | |
1510 | version: 1 (50 bytes) |
|
1518 | version: 1 (50 bytes) | |
1511 | 1ea73414a91b0920940797d8fc6a11e447f8ea1e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1519 | 1ea73414a91b0920940797d8fc6a11e447f8ea1e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1512 | $ hg bundle -R repo-with-obs --config experimental.evolution.bundle-obsmarker=true --type 'v2;obsolescence=no' --all --hidden bundle-type-without-obs2 |
|
1520 | $ hg bundle -R repo-with-obs --config experimental.evolution.bundle-obsmarker=true --type 'v2;obsolescence=no' --all --hidden bundle-type-without-obs2 | |
1513 | 1 changesets found |
|
1521 | 1 changesets found | |
1514 | $ hg debugbundle bundle-type-without-obs2 --part-type obsmarkers |
|
1522 | $ hg debugbundle bundle-type-without-obs2 --part-type obsmarkers | |
1515 | Stream params: {Compression: BZ} |
|
1523 | Stream params: {Compression: BZ} |
General Comments 0
You need to be logged in to leave comments.
Login now