I've asked this before, but I think I understand how the rebase source and
destination are specified now in thg 2.0 workbench and I thought I'd check
again if my thg 2.x would support my current workflow using thg 1.10.
So I just installed thg v. 2.3.
I have 1 mq patch applied in my local hg repository.
I pull the latest changesets to my local repository.
Now I'd like to rebase the mq applied patches (currently just 1, but could
be several) on top of the latest changeset that I just pulled.
I update to that latest changeset.
Now I right-click on the mq applied patch go to Modify History... and
Rebase is disabled. Why? The rebase extension works incredibly well on
applied mq patches, invoking your specified merge tool for manual merges
when necessary.
I know that Steve suggested using pull --rebase, but I really want to do
the rebase at some time after the pull, so I can see what the new
changesets that I pulled are and possibly make some additional changes to
my patch or create a new one before I rebase.
This would already be 1 step more than I have to do with thg 1.10 because
there I don't have to update to the destination before I request the rebase.
Anyway, if I'm doing this incorrectly or I need to create a bug somewhere
for it please let me know.
Thanks,
Mike
ps The previous message is below just FYI.
On Thu, May 5, 2011 at 11:48 PM, Michael Jay Lippert
<[email protected]>wrote:
> 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
>
>
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
