Commit 1c6840f9 authored by Pulkit Goyal's avatar Pulkit Goyal
Browse files

commit: implement a very crude fix

parent fed5e20a8f98
Pipeline #18756 failed with stages
in 25 minutes and 12 seconds
......@@ -372,6 +372,12 @@ def _filecommit(
and ms.extras(fname).get(b'filenode-source') == b'other'
):
fparent1, fparent2 = fparent2, nullid
else:
# XXX: This is wrong
# We should only do this when ACTION_KEEP or similar was
# used during merge
fparent1, fparent2 = fparent1, nullid
force_new_node = False
# The file might have been deleted by merge code and user explicitly choose
......
......@@ -926,12 +926,12 @@ Merge:
$ hg up 'desc("b-1")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
$ hg merge 'desc("f-2")'
$ hg merge 'desc("f-2")' --debug -v
1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
(branch merge, don't forget to commit)
$ echo "extra-change to (formelly h) during the merge" > d
$ hg ci -m "mBF-change-m-0 $case_desc - one way"
$ hg ci -m "mBF-change-m-0 $case_desc - one way" --debug
created new head
$ hg manifest --rev . --debug | grep " d"
1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset !)
......@@ -939,11 +939,13 @@ Merge:
$ hg up 'desc("f-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")'
$ hg merge 'desc("b-1")' --debug -v
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ echo "extra-change to (formelly h) during the merge" > d
$ hg ci -m "mFB-change-m-0 $case_desc - the other way"
$ hg manifest --rev . --debug | grep " d"
$ hg debugindex d | ../no-linkrev
$ hg ci -m "mFB-change-m-0 $case_desc - the other way" --debug
created new head
$ hg manifest --rev . --debug | grep " d"
1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset missing-correct-output !)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment