##// 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.
Martin Geisler - - Load All Authors

File last commit:

r7734:9f73bddb default
r8165:78658990 default
Show More
test-resolve
27 lines | 453 B | text/plain | TextLexer
/ tests / test-resolve
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# test that a commit clears the merge state.
hg init repo
cd repo
echo foo > file
hg commit -Am 'add file' -d '0 0'
echo bar >> file
hg commit -Am 'append bar' -d '0 0'
echo % create a second head
hg up -C 0
echo baz >> file
hg commit -Am 'append baz' -d '0 0'
echo % failing merge
HGMERGE=internal:fail hg merge
echo resolved > file
hg resolve -m file
hg commit -m 'resolved' -d '0 0'
echo % resolve -l, should be empty
hg resolve -l