##// 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.
Adrian Buehlmann - - Load All Authors

File last commit:

r6338:0750f111 default
r8165:78658990 default
Show More
test-manifest-merging.out
15 lines | 521 B | text/plain | TextLexer
/ tests / test-manifest-merging.out
History | Source | Raw |Copy content |Copy permalink
Giorgos Keramidas
Revert changeset c67920d78248....
 r3325 % init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Giorgos Keramidas
Revert changeset c67920d78248....
 r3325 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create beta in second repo
adding beta
% create gamma in first repo
adding gamma
% pull into work and merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% revert to changeset 1 to simulate a failed merge
2 files updated, 0 files merged, 0 files removed, 0 files unresolved