On Mon, Nov 4, 2013 at 10:44 AM, Gijs Kruitbosch <gijskruitbo...@gmail.com>wrote:
> On 04/11/13, 10:30 , Neil wrote: > >> Gijs Kruitbosch wrote: >> >> On 03/11/13, 11:46 , Neil wrote: >>> >>> 14. Rebasing a bitrotted patch >>>>> 14.0 What it looks like when you qpush a patch that has conflics >>>>> 14.1 Open a rej file >>>>> 14.2 Apply the change to the file >>>>> >>>> >>>> Shouldn't be necessary these days ;-) >>>> >>> >>> Uh, why not? >>> >> >> hg pull --rebase works on your applied mq. >> >> > Sure, but I don't have all my patches applied all the time. If I work on > something, leave it for 2 weeks, and qpush it again, I usually get to do > the "fix all the .rej" dance. > > Obligatory plug for the wig script (curtesy of sfink, with slight modifications by me): http://people.mozilla.org/~tschneidereit/wig _______________________________________________ dev-platform mailing list dev-platform@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-platform
