[kteam-tools][PATCH] Add --skip command line flag to maint-rebase-branch

Paolo Pisati paolo.pisati at canonical.com
Thu Mar 17 16:48:24 UTC 2011


On 03/17/2011 04:43 PM, Stefan Bader wrote:
> Nice,
>
> looks good to me. Hm, well while you are at it... I think there is a major
> drawback with that script that it does not really detect when the rebase command
> fails and runs into stuff it should not do.
> At least that _Was_ once the case and I never really found time to look into it...
>
> Where you seeing the same still?

Nope. My problem was that when i was rebasing mvl-dove a couple of
commits that were already in master, were manually applied in mvl-dove
too, so i had a clash and i had to rebase --skip them (--continue
obviously didn't work in these cases), and the script stopped there.

-- 
bye,
p.





More information about the kernel-team mailing list