mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
e777df13c0
- save dirstate lookup and exists check - do all fs work inside a single dryrun clause - move unlinking into inner copy section - move target dir creation - eliminate undelete mess - fix a bug on mv a -> b -> a after merge
23 lines
551 B
Plaintext
23 lines
551 B
Plaintext
% create source repository
|
|
adding a
|
|
% fork source repository
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
adding b
|
|
% update source repository
|
|
% merge repositories
|
|
pulling from ../t2
|
|
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)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
M b
|
|
% rename b as c
|
|
A c
|
|
R b
|
|
% rename back c as b
|
|
M b
|