##// END OF EJS Templates
Merge with stable
Merge with stable

File last commit:

r11716:db426935 stable
r11721:0b8d17bb merge stable
Show More
test-copy-move-merge.out
37 lines | 1.0 KiB | text/plain | TextLexer
/ tests / test-copy-move-merge.out
Matt Mackall
merge: avoid double deletion mentioned in issue636
r5059 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
Matt Mackall
merge: add debug diagnostics for findcopies
r5371 searching for copies back to rev 1
unmatched files in other:
b
c
all copies found (* = to merge, ! = divergent):
c -> a *
b -> a *
checking for directory renames
Matt Mackall
merge: refactor manifestmerge init to better report effective ancestor
r8753 resolving manifests
overwrite None partial False
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 ancestor 583c7b748052 local fb3948d97f07+ remote 7f1309517659
Matt Mackall
merge: avoid double deletion mentioned in issue636
r5059 a: remote moved to c -> m
a: remote moved to b -> m
Matt Mackall
merge: introduce mergestate
r6512 preserving a for resolve of b
preserving a for resolve of c
removing a
timeless
progress: use gerund (updating) for merge progress
r11716 updating: a 1/2 files (50.00%)
Matt Mackall
merge: introduce mergestate
r6512 picked tool 'internal:merge' for b (binary False symlink False)
merging a and b to b
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 my b@fb3948d97f07+ other b@7f1309517659 ancestor a@583c7b748052
Matt Mackall
merge: allow smarter tool configuration...
r6004 premerge successful
timeless
progress: use gerund (updating) for merge progress
r11716 updating: a 2/2 files (100.00%)
Matt Mackall
merge: introduce mergestate
r6512 picked tool 'internal:merge' for c (binary False symlink False)
merging a and c to c
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 my c@fb3948d97f07+ other c@7f1309517659 ancestor a@583c7b748052
Matt Mackall
merge: allow smarter tool configuration...
r6004 premerge successful
Matt Mackall
merge: avoid double deletion mentioned in issue636
r5059 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-- b --
0
1
2
-- c --
0
1
2