Hi,
there was a question in:
http://code.google.com/p/sympy/issues/detail?id=608#c7
about how to rebase the MQ patches to the latest tip:
---
> > I just tried to submit 4 patches (fix of #608, capital gamma function,
> > ascii-art for
> > floor/ceiling, and misc changes to pprint tests),
On Wed, Apr 23, 2008 at 1:38 AM, Ondrej Certik <[EMAIL PROTECTED]> wrote:
> Hi,
>
> there was a question in:
>
> http://code.google.com/p/sympy/issues/detail?id=608#c7
>
> about how to rebase the MQ patches to the latest tip:
>
> ---
> > > I just tried to submit 4 patches (fix of #608, ca
Thanks, that helped a lot!
Fortunately my case was the easy one, and I think I got the idea. :)
Roberto.
On Tue, Apr 22, 2008 at 8:44 PM, Ondrej Certik <[EMAIL PROTECTED]> wrote:
>
> On Wed, Apr 23, 2008 at 1:38 AM, Ondrej Certik <[EMAIL PROTECTED]> wrote:
> > Hi,
> >
> > there was a question
On Wed, Apr 23, 2008 at 01:38:48AM +0200, Ondrej Certik wrote:
>
> Hi,
>
> there was a question in:
>
> http://code.google.com/p/sympy/issues/detail?id=608#c7
>
> about how to rebase the MQ patches to the latest tip:
>
> ---
> > > I just tried to submit 4 patches (fix of #608, capital gam
On Wed, Apr 23, 2008 at 11:19 PM, Kirill Smelkov
<[EMAIL PROTECTED]> wrote:
>
> On Wed, Apr 23, 2008 at 01:38:48AM +0200, Ondrej Certik wrote:
> >
> > Hi,
> >
> > there was a question in:
> >
> > http://code.google.com/p/sympy/issues/detail?id=608#c7
> >
> > about how to rebase the MQ pat
On Apr 23, 1:38 am, "Ondrej Certik" <[EMAIL PROTECTED]> wrote:
> If the conflict is difficult to fix:
>
> 4) hg qpop -a; hg up "number of the revision that worked";
>
> 5) hg push; hg qdelete -r qbase:qtip
> 6) hg merge tip
>
> now merge the changesets using the powerful mercurial merge facility
