Oops (I always forget that I have to reply all to get my response to the
list. sorry)
On Thu, May 5, 2011 at 5:35 PM, Michael Jay Lippert
<[email protected]> wrote:
>
>
> On Thu, May 5, 2011 at 6:22 PM, Steve Borho <[email protected]> wrote:
>>
>> On Thu, May 5, 2011 at 4:48 PM, Michael Jay Lippert
>> <[email protected]> wrote:
>> > Hi,
>> > With tortoisehg v1 and mq and rebase extensions, after I pulled new
>> > revisions, I would qrefresh the mq patch, and then select the base
patch
>> > revision, right-click on the latest new revision and select rebase.
>> >
>> > This would rebase my mq patches onto the latest revisions, opening up
my
>> > merge tool for any conflicts that couldn't be automatically resolved.
>> >
>> > Now I just tried this with thg v2, and it didn't seem to do anything. I
>> > was
>> > right-clicking and selecting modify history | rebase...
>> >
>> > The Rebase dialog seemed to have a lot more options, which I left alone
>> > since I figured they'd work the same as in v1.
>> >
>> > The rebase said it finished, but the mq patch revision didn't move.
>> >
>> > What am I doing wrong? Is there a different way I should be doing this
>> > with
>> > v2?
>>
>> I never use rebase on patch queues so maybe someone who does can speak
up.
>>
>> One thing you do have to be careful of is the order. You first update
>> to the revision you would like to move revisions to (usually the new
>> tip), then select the base of the revisions you want to rebase and
>> select rebase out of the context menu.
>>
>> --
>> Steve Borho
>
> Thanks Steve.
> I see, I think in the old world there was a "selected" revision and a
> right-clicked on revision, so I didn't update to the revision I was moving
> revisions to.
>
> If you don't use rebase on patch queues, do you have some other way of
> accomplishing the same thing? I've seen mention of shelve, but wasn't sure
> if that would be applicable.
>
> Mostly I use rebase because it will use my merge tool to resolve
conflicts.
I own all of the repos I work on, so I just push to them. I suspect
using pull --rebase would do what you want.
--
Steve Borho
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
