reorder patches

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

reorder patches

Jack Andrews-2
hi guys,

say i have a series of patches A,B,C each of which patches the same
part of a file. is there an automated way to reorder these patches to
C,B,A?  or are there some things that just have to be done by hand?


ta, jack
Reply | Threaded
Open this post in threaded view
|

Re: reorder patches

Pkun
Jack Andrews wrote:
> hi guys,
>
> say i have a series of patches A,B,C each of which patches the same
> part of a file. is there an automated way to reorder these patches to
> C,B,A?  or are there some things that just have to be done by hand?
>
>
> ta, jack
>  
I suppose there is no such way. If you patches are very simple and only
add a independent strings you have a chance (with possible problems).
But for more complex patches there is no unified way.
Reply | Threaded
Open this post in threaded view
|

Re: reorder patches

Tim Waugh
In reply to this post by Jack Andrews-2
On Thu, 2008-06-19 at 23:12 +1000, Jack Andrews wrote:
> say i have a series of patches A,B,C each of which patches the same
> part of a file. is there an automated way to reorder these patches to
> C,B,A?  or are there some things that just have to be done by hand?

This was the original reason for trying to implement 'flipdiff' -- you
may or may not find that it works for you.  Unfortunately it turns out
to be a hard problem when all you have is the patches, so there are lots
of cases it won't work for.

Tim.
*/


signature.asc (196 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: reorder patches

Jack Andrews-2
On Thu, Jun 19, 2008 at 11:18 PM, Tim Waugh <[hidden email]> wrote:
> This was the original reason for trying to implement 'flipdiff' -- you
> may or may not find that it works for you.  Unfortunately it turns out
> to be a hard problem when all you have is the patches, so there are lots
> of cases it won't work for.

is it solved in the case i have the base source as well as the patches?

ta, jack
Reply | Threaded
Open this post in threaded view
|

Re: reorder patches

Tim Waugh
On Thu, 2008-06-19 at 23:27 +1000, Jack Andrews wrote:
> is it solved in the case i have the base source as well as the patches?

Certainly 'git rebase -i' seems to manage it quite well for git
repositories.  It is more sophisticated in that it allows several
different types of 'merge driver' to help with merge conflicts.

Tim.
*/


signature.asc (196 bytes) Download Attachment