##// 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.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r5051:e3dffbdc default
r8165:78658990 default
Show More
test-issue322.out
12 lines | 372 B | text/plain | TextLexer
/ tests / test-issue322.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
fix issue 322....
 r2953 % file replaced with directory
adding a
% should fail - would corrupt dirstate
Alexis S. L. Carvalho
update tests output
 r5051 abort: file 'a' in dirstate clashes with 'a/a'
Vadim Gelfer
fix issue 322....
 r2953 % directory replaced with file
adding a/a
% should fail - would corrupt dirstate
Alexis S. L. Carvalho
update tests output
 r5051 abort: directory 'a' already in dirstate
Vadim Gelfer
fix issue 322....
 r2953 % directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
Alexis S. L. Carvalho
update tests output
 r5051 abort: directory 'b' already in dirstate