mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
ab028fc78a
This change ensures that removes happen first in applyupdates(). This avoids issues where we try to make a case-only rename of a file on a case insensitive system. Without this patch, the add of the new name happens before the remove of the old one - which results in the file not existing, as the two names are effectively the same. With the patch, the old name gets removed then the new one gets added, which is always safe.
56 lines
1.2 KiB
Plaintext
56 lines
1.2 KiB
Plaintext
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
Main should be gone
|
|
a
|
|
created new head
|
|
changeset: 3:ded32b0db104
|
|
tag: tip
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: Added side2
|
|
|
|
changeset: 2:92a816cea698
|
|
parent: 0:537353581d3d
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: Added side1
|
|
|
|
changeset: 1:221226fb2bd8
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: Added main
|
|
|
|
changeset: 0:537353581d3d
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: Added a
|
|
|
|
Should have two heads, side2 and main
|
|
changeset: 3:ded32b0db104
|
|
tag: tip
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: Added side2
|
|
|
|
changeset: 1:221226fb2bd8
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: Added main
|
|
|
|
Should show a side1 side2
|
|
a
|
|
side1
|
|
side2
|
|
resolving manifests
|
|
overwrite True partial False
|
|
ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8
|
|
side2: remote deleted -> r
|
|
side1: remote deleted -> r
|
|
main: remote created -> g
|
|
removing side1
|
|
removing side2
|
|
getting main
|
|
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
Should only show a main
|
|
a
|
|
main
|