##// 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.
Augie Fackler - - Load All Authors

File last commit:

r7821:9fe7e6ac default
r8165:78658990 default
Show More
test-commit-unresolved.out
14 lines | 481 B | text/plain | TextLexer
/ tests / test-commit-unresolved.out
History | Annotation | Raw |Copy content |Copy permalink
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
% Merging a conflict araises
merging A
warning: conflicts during merge.
merging A failed!
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% Correct the conflict without marking the file as resolved
abort: unresolved merge conflicts (see hg resolve)
% Mark the conflict as resolved and commit