view tests/test-merge-types.out @ 7585:075b7ef0f84d

convert/gnuarch: follow continuation-of revisions

Built on top of previous patches:
 - continuation-of parsing
 - registered archives retrieval
 - use of fully qualified revisions

This allows the converter scanning for more source revisions
following the tree versions 'leaked' through the continuation-of
informations. Coupled with the registered archives retrieval, this
makes possible to decide to follow such a hint or stop scanning for
more revisions.

This also implies some changes in the retrieval of some base-0
revisions when they're continuation-of other revisions, in that
case a 'replay' will work where a simple 'get' fails because the
dir exists already. I found the code dealing with 'replay' quite
good as it has already a fallback to 'get' in the error path.

adding a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
resolving manifests
 overwrite None partial False
 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
  searching for copies back to rev 1
 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
 a: update permissions -> e
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is local parent, executable is other
a has no flags (default for conflicts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
resolving manifests
 overwrite None partial False
 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
  searching for copies back to rev 1
 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
 a: remote is newer -> g
getting a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is other parent, executable is local
a has no flags (default for conflicts)