Darcs edit-record workflow

Itโ€™s not uncommon for me to write down a patch, insert it into my intermediate branch, and then understand that I did something small and stupid, like a typo in the registration message, or something similar trivial, which does not require (for my mind) a whole new patch

In these cases, I used:

darcs amend-record 

Patch update. But when I pull out the darcs again, you will consider the patches as conflicting, so I have to forget and return the patch in the intermediate branch, and then pull it again.

Is there a darcs command or option that will allow me to more easily pull out the patched patch?

+4
source share
2 answers

You can try running darcs unpull on the intermediate branch first and then pulling the patched patch.

+3
source

Not really. Changing a patch makes it another patch, although the name is the same as before. the fix is โ€‹โ€‹usually used only in the local repo before the patch has been pushed / pulled elsewhere. If the patch was transferred to other repositories, you will need to destroy it and drag the modified version. (Wash - this is the modern spelling of "lowly").

Alternatively, use the rollback command; it is friendlier when the repositories in question are publicly available and used by several developers.

+5
source

All Articles