##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert/bzr: make it work with filemaps (issue1631)...
convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.
Peter Arrenbrecht - - Load All Authors

File last commit:

r7320:8dca507e default
r8165:78658990 default
Show More
test-merge-types.out
27 lines | 1.0 KiB | text/plain | TextLexer
/ tests / test-merge-types.out
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
update test-merge-types
 r5710 adding a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
update test-merge-types
 r5710 resolving manifests
overwrite None partial False
ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
searching for copies back to rev 1
Peter Arrenbrecht
ui: log non-interactive default response to stdout when verbose...
 r7320 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
Matt Mackall
update test-merge-types
 r5710 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
Peter Arrenbrecht
ui: log non-interactive default response to stdout when verbose...
 r7320 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
Matt Mackall
update test-merge-types
 r5710 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)