##// 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.
Stefano Tortarolo - - Load All Authors

File last commit:

r6906:808f03f6 default
r8165:78658990 default
Show More
test-rebase-issue-noparam-single-rev.out
64 lines | 940 B | text/plain | TextLexer
/ tests / test-rebase-issue-noparam-single-rev.out
History | Source | Raw |Copy content |Copy permalink
Stefano Tortarolo
Add rebase extension
 r6906 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
@ 4:r2
|
o 3:r1
|
| o 2:l1
|/
o 1:c2
|
o 0:c1
% Rebase with no arguments - single revision in source branch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
rebase completed
@ 4:l1
|
o 3:r2
|
o 2:r1
|
o 1:c2
|
o 0:c1
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
created new head
@ 4:r1
|
| o 3:l2
| |
| o 2:l1
|/
o 1:c2
|
o 0:c1
% Rebase with no arguments - single revision in target branch
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
rebase completed
@ 4:l2
|
o 3:l1
|
o 2:r1
|
o 1:c2
|
o 0:c1