[sage-combinat-devel] Re: how to rebase a patch ?

2012-07-17 Thread Dima Pasechnik
On Tuesday, 17 July 2012 12:55:13 UTC+8, Keshav Kini wrote: Dima Pasechnik dimp...@gmail.com writes: On Monday, 16 July 2012 20:49:31 UTC+8, Keshav Kini wrote: Not really. That's only if you do `hg import --exact`, and your patch has the correct headers. yes, but it

Re: [sage-combinat-devel] Re: how to rebase a patch ?

2012-07-16 Thread Christian Stump
what I usually do is: this is a very nice and detailed description -- thanks! maybe you wanna add it to wiki? * hg qrefresh followed by hg export qtip foo.patch is there, in this situation, a difference between hg export qtip foo.patch and hg qrefresh (that's what I usually do here) ?

[sage-combinat-devel] Re: how to rebase a patch ?

2012-07-16 Thread Keshav Kini
Simon King simon.k...@uni-jena.de writes: Hi Frederic, what I usually do is: * When I have a patch foo.patch that needs rebasing, then I take a Sage installations with all required prerequisites (i.e., the dependencies of foo.patch). * Then, I try to apply foo.patch (i.e., hg

[sage-combinat-devel] Re: how to rebase a patch ?

2012-07-16 Thread Keshav Kini
Christian Stump christian.st...@gmail.com writes: is there, in this situation, a difference between hg export qtip foo.patch and hg qrefresh (that's what I usually do here) ? `hg qrefresh` adds uncommitted changes into the topmost patch; `hg export qtip foo.patch` simply copies the existing

[sage-combinat-devel] Re: how to rebase a patch ?

2012-07-16 Thread Dima Pasechnik
This pain is caused by mq (sorry, mq, you are evil. live with it :-)). Just pretending that the patch is a regular patch, importing it with hg import would land you in a workflow very much like the git's workflow for the problem Ralf described. (git doesn't really have an advantage here, rather

[sage-combinat-devel] Re: how to rebase a patch ?

2012-07-16 Thread Keshav Kini
Dima Pasechnik dimp...@gmail.com writes: This pain is caused by mq (sorry, mq, you are evil. live with it :-)). Just pretending that the patch is a regular patch, importing it with hg import would land you in a workflow very much like the git's workflow for the problem Ralf described. Not

[sage-combinat-devel] Re: how to rebase a patch ?

2012-07-16 Thread Dima Pasechnik
On Monday, 16 July 2012 20:49:31 UTC+8, Keshav Kini wrote: Dima Pasechnik dimp...@gmail.com writes: This pain is caused by mq (sorry, mq, you are evil. live with it :-)). Just pretending that the patch is a regular patch, importing it with hg import would land you in a workflow

[sage-combinat-devel] Re: how to rebase a patch ?

2012-07-16 Thread Keshav Kini
Dima Pasechnik dimp...@gmail.com writes: On Monday, 16 July 2012 20:49:31 UTC+8, Keshav Kini wrote: Not really. That's only if you do `hg import --exact`, and your patch has the correct headers. yes, but it should have them if its creator had [diff] git = 1 in her/his .hgrc.