mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
7930704b3e
The issue came from the 63f9ab8034d1 fix for issue586 working only for manifest.add() fast path, where the incorrect removed file set was ignored. This path was no longer taken after 5958346d119e refactoring.
39 lines
1.0 KiB
Plaintext
39 lines
1.0 KiB
Plaintext
adding a
|
|
adding b
|
|
pulling from ../a
|
|
searching for changes
|
|
warning: repository is unrelated
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
C b
|
|
% create test repos
|
|
adding a
|
|
adding b
|
|
pulling from ../repoa
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
(run 'hg update' to get a working copy)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
pulling from ../repob
|
|
searching for changes
|
|
warning: repository is unrelated
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
% merge both repos
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
% move b content
|
|
src/b
|
|
tst/a
|