Geek Answers Handbook

Add additional changes to change set 0 (zero)?

I have an Hg repository with change set 0 representing only "add .hgignore". Starting with changeet 1, I added incremental changes to a series of several versions of Subversion on the script. Then I worked with Hg for a while.

Now I decided that it would take a few more Svn changes, which are located earlier in the history than the initial version (changeet 1 in Hg).

Is it possible to insert new changes in the range from 0 to 1? If yes: how?

+2
source share
2 answers

Mercurial Mercurial. convert extension. . , .

,

$ hg glog
@  changeset:   1:aaee9686dedf
|  tag:         tip
|  user:        Martin Geisler <mg@lazybytes.net>
|  date:        Fri Mar 23 15:08:11 2012 +0100
|  summary:     bar
|
o  changeset:   0:17474bd28fe5
   user:        Martin Geisler <mg@lazybytes.net>
   date:        Fri Mar 23 15:08:05 2012 +0100
   summary:     foo

SVN:

$ hg update null
$ run-your-script.sh

root - . , baz:

$ hg glog
@  changeset:   2:515e1292862b
   tag:         tip
   parent:      -1:000000000000
   user:        Martin Geisler <mg@lazybytes.net>
   date:        Fri Mar 23 15:09:19 2012 +0100
   summary:     baz

o  changeset:   1:aaee9686dedf
|  user:        Martin Geisler <mg@lazybytes.net>
|  date:        Fri Mar 23 15:08:11 2012 +0100
|  summary:     bar
|
o  changeset:   0:17474bd28fe5
   user:        Martin Geisler <mg@lazybytes.net>
   date:        Fri Mar 23 15:08:05 2012 +0100
   summary:     foo

- : , 17474bd28fe5 515e1292862b . hg log --debug,

17474bd28fe535c15c7dad3659994ab048146e99 515e1292862ba2d6776294ffb00c533dc6850c66


 $ hg convert --splicemap map.txt your-repo your-spliced-repo

your-spliced-repo.

+5

: , .

3 . -

,

  • Rebase (rebase -s tip -d X , N N )
  • Histedit ( -, , 1 N )
  • MQ ( , MQ, -, , , , N + 2 N )

MQ ( MQ , | )

+1

More articles:


All Articles