mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
6bf7f7256d
We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.
20 lines
476 B
Plaintext
20 lines
476 B
Plaintext
adding a/f
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
copying a/f to b/f
|
|
removing a/f
|
|
adding a/aa/g
|
|
pulling from ../r2
|
|
searching for changes
|
|
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)
|
|
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
M b/f
|
|
A b/aa/g
|
|
a/aa/g
|
|
R a/aa/g
|
|
R a/f
|