Fossil

Bug in "fossil patch pull"
Login

Bug in "fossil patch pull"

Bug in "fossil patch pull"

(1) By D. Richard Hipp (drh) on 2024-12-16 15:01:49 [source]

Pulling from a remote repository with edits does not always exactly replicate the remote repository. This happens, for example, when the remote repo did a merge and then reverted some of the files that were changed by the merge. The following is a test case using the Fossil repository itself:

  • fossil up de6f88a6f00fa854
  • fossil merge f0a48c8faad9c3db
  • fossil revert src/merge.c
  • Move to another directory and/or another computer.
  • fossil patch pull ORIGINAL-CHECKOUT
  • fossil diff src/merge.c

The final "fossil diff" in the test sequence above shows changes in the src/merge.c file. The "fossil revert" from the third step of the procedure did not get carried over by the "fossil patch pull".

(2) By D. Richard Hipp (drh) on 2024-12-16 16:21:11 in reply to 1 [link] [source]

See the fix at check-in 3a39ae4c87773acf.