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.
>
> 7) hg di -r revision without the patch:tip > /tmp/x
>
> and we have the rebased patch in /tmp/x, so I for example do something like
>
> 8) hg qimport /tmp/x; hg qrefresh -e;
>
> fix the description etc.
>
> Then repeat the steps 5) to 8) with all patches.
I know the builtin way is more complicated than it should be but why
not use it ?
hg qpop -a
hg up "number of the revision that worked"
hg qpush -a
# Save the queue here for reference, it gives you a name like
"patches.N"
hg qsave -ce
hg up -C "revision where to rebase from"
# Push until all patches are rebased (or qpush -am), merging them if
necessary
hg qpush -m
# Cleanup current and reference queue
hg qpop -a
hg qpop -a -n patches.N
# At this point, you can get rid of .hg/patches.N
# And now your new rebased queue is here:
hg qpush -a
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"sympy" group.
To post to this group, send email to sympy@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at http://groups.google.com/group/sympy?hl=en
-~----------~----~----~----~------~----~------~--~---
