Tuesday, January 31, 2017

Mercurial hg diff patch wiggle

remember diff is from 30652 to 30659 to make a patch that will turn 30652 into 30659

hg diff -r 30652 -r 30659 >~/patch
patch  -p1 <~/patch

if the patch fails to apply, the bits can be wiggled in like:

wiggle --replace mc/main/ncsi.c mc/main/ncsi.c.rej
wiggle --replace mc/main/pdma.c mc/main/pdma.c.rej


wiggle -rp ~/patch

should do the whole thing, but it can't create files.

No comments:

Post a Comment