##// END OF EJS Templates
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.

File last commit:

r4659:7a7d4937 default
r8165:78658990 default
Show More
test-empty-file
25 lines | 422 B | text/plain | TextLexer
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
r3509 #!/bin/sh
hg init a
cd a
touch empty1
hg add empty1
hg commit -m 'add empty1' -d '1000000 0'
touch empty2
hg add empty2
hg commit -m 'add empty2' -d '1000000 0'
hg up -C 0
touch empty3
hg add empty3
hg commit -m 'add empty3' -d '1000000 0'
hg heads
hg merge 1
Thomas Arendsen Hein
Kill trailing spaces
r4659 # before changeset 05257fd28591, we didn't notice the
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
r3509 # empty file that came from rev 1.
hg status
hg commit -m merge -d '1000000 0'
Matt Mackall
make manifest friendlier...
r3736 hg manifest --debug tip