##// 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.
Marek Kubica - - Load All Authors

File last commit:

r7053:209ef5f3 default
r8165:78658990 default
Show More
test-convert-bzr-merges.out
27 lines | 584 B | text/plain | TextLexer
/ tests / test-convert-bzr-merges.out
History | Annotation | Raw |Copy content |Copy permalink
% test multiple merges at once
initializing destination source-hg repository
scanning source...
sorting...
converting...
4 Initial add
3 Added branch1 file
2 Added parent file
1 Added brach2 file
0 Merged branches
o 5 "(octopus merge fixup)" files:
|\
| o 4 "Merged branches" files: file-branch2
| |\
o---+ 3 "Added brach2 file" files: file-branch2
/ /
| o 2 "Added parent file" files: file-parent
| |
o | 1 "Added branch1 file" files: file file-branch1
|/
o 0 "Initial add" files: file
% manifest of tip
644 file
644 file-branch1
644 file-branch2
644 file-parent