mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
53 lines
1.2 KiB
Plaintext
53 lines
1.2 KiB
Plaintext
created new head
|
|
merging baz and foo to baz
|
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
merging foo and baz to baz
|
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
created new head
|
|
initializing destination new repository
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
5 add foo bar
|
|
4 change foo
|
|
3 make bar and baz copies of foo
|
|
2 merge local copy
|
|
1 merge remote copy
|
|
0 mark baz executable
|
|
comparing with ../orig
|
|
searching for changes
|
|
no changes found
|
|
% check shamap LF and CRLF handling
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
1 change foo again again
|
|
0 change foo again
|
|
% init broken repository
|
|
created new head
|
|
% break it
|
|
initializing destination fixed repository
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
4 init
|
|
ignoring: data/b.i@1e88685f5dde: no match found
|
|
3 changeall
|
|
2 changebagain
|
|
1 merge
|
|
0 moveb
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
3 files, 5 changesets, 5 total revisions
|
|
% manifest -r 0
|
|
a
|
|
% manifest -r tip
|
|
a
|
|
c
|
|
d
|