Phab failing to apply patches
Jan Stolarek
jan.stolarek at p.lodz.pl
Sun Jan 17 15:24:52 UTC 2016
Can we somehow force Phab to apply a patch against a base commit from which the patch was created?
Current setting does not seem very useful - it will probably force me to rebase my patches once a
week or so. That will be very painful.
Janek
Dnia piątek, 15 stycznia 2016, Thomas Miedema napisał:
> It changed some time last year.
>
> Before, Harbormaster would sometimes try to build some bizarro intermediate
> mix of base commit + patch + master. See
> https://ghc.haskell.org/trac/ghc/ticket/9855.
>
>
> On Fri, Jan 15, 2016 at 7:06 PM, Jan Stolarek <jan.stolarek at p.lodz.pl>
>
> wrote:
> > Somehow I always I believed that Harbormaster does not apply a patch onto
> > master but onto the
> > revision it was created from. Has there been any change in this behaviour
> > recently?
> >
> > Janek
> >
> > Dnia piątek, 15 stycznia 2016, Thomas Miedema napisał:
> > > "Unable to apply patch!" means just that. Harbormaster is unable to
> > > apply the patch (to master). You can test it yourself by running 'arc
> > > patch --nobranch D1778` on an up-to-date checkout of the master branch,
> > > and it will fail in the same way.
> > >
> > > Solution: rebase your patch onto master, and update the Diff. You'll
> >
> > notice
> >
> > > there are indeed merge problems.
> > >
> > >
> > > On Fri, Jan 15, 2016 at 6:49 PM, Jan Stolarek <jan.stolarek at p.lodz.pl>
> > >
> > > wrote:
> > > > It seems that Phab is once again failing to apply patches (eg. D1778,
> > > > which built perfectly fine
> > > > until latest update). Is anyone else experiencing this?
> > > >
> > > > Janek
> > > >
> > > > ---
> > > > Politechnika Łódzka
> > > > Lodz University of Technology
> > > >
> > > > Treść tej wiadomości zawiera informacje przeznaczone tylko dla
> >
> > adresata.
> >
> > > > Jeżeli nie jesteście Państwo jej adresatem, bądź otrzymaliście ją
> > > > przez pomyłkę
> > > > prosimy o powiadomienie o tym nadawcy oraz trwałe jej usunięcie.
> > > >
> > > > This email contains information intended solely for the use of the
> > > > individual to whom it is addressed.
> > > > If you are not the intended recipient or if you have received this
> > > > message in error,
> > > > please notify the sender and delete it from your system.
> > > > _______________________________________________
> > > > ghc-devs mailing list
> > > > ghc-devs at haskell.org
> > > > http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
> >
> > ---
> > Politechnika Łódzka
> > Lodz University of Technology
> >
> > Treść tej wiadomości zawiera informacje przeznaczone tylko dla adresata.
> > Jeżeli nie jesteście Państwo jej adresatem, bądź otrzymaliście ją przez
> > pomyłkę
> > prosimy o powiadomienie o tym nadawcy oraz trwałe jej usunięcie.
> >
> > This email contains information intended solely for the use of the
> > individual to whom it is addressed.
> > If you are not the intended recipient or if you have received this
> > message in error,
> > please notify the sender and delete it from your system.
---
Politechnika Łódzka
Lodz University of Technology
Treść tej wiadomości zawiera informacje przeznaczone tylko dla adresata.
Jeżeli nie jesteście Państwo jej adresatem, bądź otrzymaliście ją przez pomyłkę
prosimy o powiadomienie o tym nadawcy oraz trwałe jej usunięcie.
This email contains information intended solely for the use of the individual to whom it is addressed.
If you are not the intended recipient or if you have received this message in error,
please notify the sender and delete it from your system.
More information about the ghc-devs
mailing list