##// 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.
Matt Mackall - - Load All Authors

File last commit:

r4819:97971245 default
r8165:78658990 default
Show More
test-issue612
24 lines | 244 B | text/plain | TextLexer
/ tests / test-issue612
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
mkdir t
cd t
hg init
mkdir src
echo a > src/a.c
hg ci -Ama -d "10000000 0"
hg mv src source
hg ci -Ammove -d "1000000 0"
hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate -d "1000000 0"
hg st
hg merge
hg st