Hello Christian and Nikolay Am Dienstag, 14. April 2015, 20:02:17 schrieb Christian Brabandt: > 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
Or in ~/.hgrc Yes, I forgot to mention it, just for reference: [extensions] rebase = > > > 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) Huh, pretty old from 2012-01-01 :) > > 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). Support for these revision sets like tip~7 had been added to rebase on 2011-10-15, but only for --source and --base [1]. A few months later on 2012-05-01 it had been added to the --dest option [2]. [1] http://selenic.com/hg/rev/b12362ab13e7 [2] http://selenic.com/hg/rev/ae6dddffe4f1 I've adapted the script to use a temporary local tag to store the rebase destination and avoid the use of revision sets. Hope it works with your version. diff -r b6c1f5d29ad3 -r 5109f92eb4e5 tools/clean_repo.sh --- a/tools/clean_repo.sh Tue Apr 14 18:58:05 2015 +0200 +++ b/tools/clean_repo.sh Wed Apr 15 00:59:39 2015 +0200 @@ -80,6 +80,7 @@ # thing, see # http://mercurial.selenic.com/wiki/Tag # http://mercurial.selenic.com/wiki/TagDesign +hg tag -f --local rebasedest hg tag -f -r 2ec8266fa254f9f90fd302df275d2813ae08a8e6 v7-0-225 hg tag -f -r 042fa969dab175d414d611425d8a61424bacf75f v7-1-008 hg tag -f -r 12cecc379574aba2231cbba54c4eaeef3432db69 v7-2-080 @@ -112,13 +113,14 @@ The others have been moved to the correct changeset. EOF -hg rebase --dest tip~19 --source tip~18 --collapse --logfile logfile.txt +hg rebase --dest rebasedest --source tip~18 --collapse --logfile logfile.txt rm logfile.txt # remove unused tag hg tag -m"Remove unused tag from invalid line of history" --remove start # add missing tags +hg tag -f --local rebasedest hg tag -r f03c3fae0a99 v7-0-076 hg tag -r v7-2-000 v7-2 hg tag -r ee53a39d5896 v7-3 @@ -131,4 +133,7 @@ # Optionally squash all separate tag adding commits into one # with a proper description -hg rebase --dest tip~7 --source tip~6 --collapse -m"Add missing tags" +hg rebase --dest rebasedest --source tip~6 --collapse -m"Add missing tags" + +# cleanup +hg tag --local --remove rebasedest -- -- 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.
