Fossil SCM

drh 1 year, 3 months ago

Post: Bug in "fossil patch pull"

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".

drh 1 year, 3 months ago

See the fix at check-in 3a39ae4c87773acf.

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button