On Di, 14 Apr 2015, Nikolay Pavlov wrote:
> 2015-04-14 21:02 GMT+03:00 Christian Brabandt <[email protected]>:
> > On Di, 14 Apr 2015, Nikolay Pavlov wrote:
> >
> >> 2015-04-14 20:45 GMT+03:00 Christian Brabandt <[email protected]>:
> >> > Hi Markus!
> >> >
> >> > On Mo, 13 Apr 2015, Markus Heidelberg wrote:
> >> >
> >> > [...]
> >> >> hg rebase --dest tip~7 --source tip~6 --collapse -m"Add missing tags"
> >> >
> >> > I was brave and tested your script. There are two points I noticed.
> >> > 1) rebase needs to be enabled explicitly in your .hg/hgrc
> >> > 2) hg rebase does not seem to understand the tip~7 name
> >>
> >> It should. Wondering what is your mercurial version.
> >
> > Ubuntu 12.04 LTS:
> > Mercurial Distributed SCM (version 2.0.2)
> > (see http://mercurial.selenic.com for more information)
> >
> > Copyright (C) 2005-2011 Matt Mackall and others
> > This is free software; see the source for copying conditions. There is NO
> > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> >
> >> According to `hg annotate` tip~7 was committed at Sat Apr 30 17:43:04 2011
> >> +0200.
> >
> > While hg log -r tip~7 worked, hg rebase complained that tip~7 was no
> > valid revision number (or something like that, sorry, I did not keep the
> > log).
>
> Maybe you tried to rebase published revision? This is most common
> rebase problem: if some commit is marked as published mercurial will
> not allow you to rebase it. You need to use `hg phase` to set phase to
> draft or secret then (note: draft revision can only have public or
> draft parent, secret can only have public, draft or secret: don’t try
> to change phase of *one* revision).
No I worked locally and pushed only after I noticed rebase didn't work
for me.
Best,
Christian
--
Manche halten ihre veränderte Ansicht eines Menschen für eine
Veränderung desselben.
-- Jean Paul
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
