Add a parent to the original changeset in Mercurial -


i have project 24 months of source control history in mercurial repository.

i've found old tarballs of project predate source control, , think useful import repository "pre-historic" changesets.

can somehow add parent initial commit?

alternatively, possible re-play entire repository history on top of tarballs, preserving metadata (timestamps etc)?

is possible have new parent commits use timestamps of these old tarballs?

you can use convert extension build new repository tarballs imported revisions before current root revision.

first, import tarballs based on null revision:

$ hg update null $ tar -xvzf backup-2010.tar.gz $ hg addremove $ hg commit -m 'version 2010' $ rm -r * $ tar -xvzf backup-2011.tar.gz $ hg addremove $ hg commit -m 'version 2011'

i'm using addremove above give mercurial chance detect renames between each tarball (look @ --similarity flag fine-tune , use hg rename --after hand mercurial further). also, remove files in working copy before importing new tarball: way next commit contain snapshot present in tarball unpack.

after you've imported tarballs above, have parallel history in repository:

[c1] --- [c2] --- [c3] ... [cn]  [t1] --- [t2] --- [tm]

your old commits c1 cn , commits tarballs t1 tm. @ moment share no history — it's if used hg pull -f pull unrelated repository current one.

the convert extension can used mercurial mercurial conversion rewrite parent revision of c1 tm. use --splicemap flag this. needs file with

<full changeset hash c1> <full changeset hash tm>

use hg log --template '{node} ' -r c1 -r tm > splicemap generate such file. run

$ hg convert --splicemap splicemap . spliced

to generate new repository spliced combined history. repository new, need re-clone it.

this technique similar using hg rebase suggested kindread. difference convert wont try merge anything: rewrites parent pointer in c1 tm. since there no merging involved, cannot fails weird merge conflicts.


Comments

Post a Comment

Popular posts from this blog

java.util.scanner - How to read and add only numbers to array from a text file -

i'm learning java , have question regarding reading file want read numbers file contains strings well. here example of file: 66.56 "3 java 3-43 5-42 2.1 1 and here coding: public class test { public static void main (string [] args){ if (0 < args.length) { file x = new file(args[0]); try{ scanner in = new scanner( new fileinputstream(x)); arraylist<double> test = new arraylist<>(); while(in.hasnext()){ if(in.hasnextdouble()){ double f=in.nextdouble(); test.add(f);} else {in.next();} } catch(ioexception e) { system.err.println("exception during reading: " + e); } } my problem add 66.56,2.1 , 1 doesn't add 3 after "3 or ignores 3-43 , 5-42 can tell me how skip strings , add doubles here? thanks all said 3 ie; "3, 3-43 , 4-42 strings either u read string , split , check number @ " , - or put in space between characters , integers. jvm after compilation tre...
Read more

rewrite - Trouble with Wordpress multiple custom querystrings -

i'm working on adding multiple querystring , doesn't seem work. i've found codes seems work others might i'm missing something. i want like: http://mydomain.com/board/?getyear=2013&getsometext2=sometext to http://mydomain.com/board/2013/sometext/ i added code below functions.php file. doesn't seem work should though. this works. echoing querystring gets both variable without problem. http://mydomain.com/board/2013/sometext/ but doesn't. tested querystring vis isset() seems nothing being set/get http://mydomain.com/board/2013/ function add_query_vars($vars) { $vars[] = "getyear"; $vars[] = "getsometext2"; return $vars; } add_filter('query_vars', 'add_query_vars'); function add_rewrite_rules($arules) { $anewrules = array('board/([^/]+)/([^/]+)/?$' => 'index.php?pagename=board&getyear=$matches[1]&getsometext2=$matches[2]'); $arules = $a...
Read more