* Turn on the rebase extension in your ~/.hgrc file * Set up a merge tool by means of some voodoo which I've now forgotten (this may even be handled automatically in newer versions of Mercurial) * Do `hg update -C foo` where foo is the version of Sage on which the patch is known to apply * Apply the patch * Do `hg heads` and note the ID of the commit which is the latest version of Sage (as opposed to the commit which is the patch you just applied) * Do `hg rebase -d ID` where ID is the ID previously noted * If a merge window pops up, resolve merge conflicts with the handy dandy merge tool you configured * Voila, the patch is now rebasedThis is more complicated to set up but also allows you to avoid retyping code and fixing up files manually.
Or simpler still, since no additional setup would be necessary (except for "git config").
git config --global merge.too kdiff3 git checkout somebranch git rebase otherbranch # in case of conflict git mergetool git rebase --continue But unfortunately you are not using git. "git gui" is also quite a powerful tool. Sorry for the noise. Ralf -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
