mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
940a0afd31
If we know original changeset we are working with - try hard to preserve it. Fallback to filelog.linkrev() only if we have no way to get original changeset, since linkrev() may point to other changeset.
52 lines
1.7 KiB
Plaintext
52 lines
1.7 KiB
Plaintext
adding 1
|
|
adding 2
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
resolving manifests
|
|
overwrite None partial False
|
|
ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c
|
|
searching for copies back to rev 1
|
|
unmatched files in other:
|
|
1a
|
|
all copies found (* = to merge, ! = divergent):
|
|
1a -> 1
|
|
checking for directory renames
|
|
1: other deleted -> r
|
|
1a: remote created -> g
|
|
removing 1
|
|
getting 1a
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
resolving manifests
|
|
overwrite None partial False
|
|
ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96
|
|
searching for copies back to rev 1
|
|
unmatched files in local:
|
|
1a
|
|
all copies found (* = to merge, ! = divergent):
|
|
1a -> 1 *
|
|
checking for directory renames
|
|
1a: local moved to 1 -> m
|
|
merging 1a and 1
|
|
my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
|
|
0 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
|
|
resolving manifests
|
|
overwrite None partial False
|
|
ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052
|
|
searching for copies back to rev 1
|
|
unmatched files in other:
|
|
1a
|
|
all copies found (* = to merge, ! = divergent):
|
|
1a -> 1 *
|
|
checking for directory renames
|
|
1: remote moved to 1a -> m
|
|
copying 1 to 1a
|
|
merging 1 and 1a
|
|
my 1@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d
|
|
removing 1
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|