Fossil

View Ticket
Login

View Ticket

Plaintext
2023-01-02
15:24 • Closed ticket [92d8265738]: "fossil patch pull" does not resolve merge conflicts. plus 5 other changes ... (artifact: 91b5c70447 user: drh)
2022-04-18
14:41 • New ticket [92d8265738]. ... (artifact: 64d1c639e2 user: drh)
Ticket Hash: 92d82657382eb3b8397dd8741a37b3b9e868910d
Title: "fossil patch pull" does not resolve merge conflicts.
Status: Closed Type: Code_Defect
Severity: Important Priority: Immediate
Subsystem: Resolution: Unable_To_Reproduce
Last Modified: 2023-01-02 15:24:37
Version Found In: 2.29
User Comments:
drh added on 2022-04-18 14:41:02:

I observed the following behavior:

  1. Machine 1: Run "fossil merge ..." such that the merge generates conflicts.

  2. Machine 1: Fix the merge conflicts.

  3. Machine 2: Run "fossil patch pull ..." from machine 1. The merge conflicts are unresolved.

It is as if the "fossil patch" command overlooked and did not transfer the edits to the file that contained the merge conflict.

drh added on 2023-01-02 15:24:37:

Unable to reproduce the problem. Reopen with a specific example if one is found.