Tell me more ×
Unix & Linux Stack Exchange is a question and answer site for users of Linux, FreeBSD and other Un*x-like operating systems.. It's 100% free, no registration required.
up vote 4 down vote favorite

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)?

share|improve this question

2 Answers

up vote 2 down vote accepted

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.

share|improve this answer
And something that does not require sources? – Maciej Piechotka Aug 17 '10 at 22:57
up vote 0 down vote

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.

share|improve this answer
I do it mainly for backporting patches. I tend to do it with version control system but I wondered if there is easier way. – Maciej Piechotka Aug 18 '10 at 1:47

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.