8

Sometimes I need to merge two patches. I can apply them but often it is not convenient (coping, temporary files etc.). Is there a tool to merge patches (assuming they are not conflicting)?

2 Answers 2

4

If you manage patches often, then you may be interested in quilt. I believe it has a patch combination feature.

See Quilt (software) for more info.

1
  • And something that does not require sources? Commented Aug 17, 2010 at 22:57
0

If you're interested in maintaining the source, you could put it into a version control system, add patches to it, and get the patches you want out of it.

2
  • I do it mainly for backporting patches. I tend to do it with version control system but I wondered if there is easier way. Commented Aug 18, 2010 at 1:47
  • @MaciejPiechotka, your best bet is to use the tools of your VCS, or tools specifically built for it. Perhaps you should look into a more modern VCS for your work, like mercurial or git. As far as I know, both have capable tools to import and otherwise interact with legacy VCS.
    – vonbrand
    Commented Jan 26, 2016 at 21:12

You must log in to answer this question.

Not the answer you're looking for? Browse other questions tagged .