rebase - In Mercurial, how to combine unrelated repositories, leaving only one root? -


i have 4 versions of project. versions 1-3 "prototypes" not under source control (they exist separate directories in filesystem). version 4 has been under source control since inception , has long history of commits.

i want combine these versions 1-3 become individual changesets each 1 descendant of previous. root of version 4 should become descendant of version 3 (and no collapsing of version 4's history of course).

all changes private, not public (there no problem rewriting history, were).

what i've done far , tried:
1. setup new hg repositories in directory of prototype versions
2. cloned repository of version 4
3. pulled (with hg pull --force) unrelated repositories versions 1-3 cloned repository.

this gives me 4 unrelated "roots" (changesets no ancestors) in single repository. when combine them don't want remember these 4 roots. hg rebase should let me move changesets , destroy originals, unlike hg merge.

here i'll use 101 revision "version 1" (which single changeset no parent) , 102 revision "version 2".

attempt 1: try hg rebase -b 102 -d 101 respone nothing rebase. presumably because have no common ancestor (i feel inconsistent... -b 102 include ancestors except common ancestor, nothing in case.)

attempt 2: try hg rebase -s 102 -d 101. results in merge conflicts. hg revert --all --rev 102 , hg resolve -m indicate prefer "version 2" in conflicts (although wonder if right way prefer 1 parent on in presence of adds/removes?). when commit, don't have linear history --- revision 102 still there!

if hg rebase --continue final command (instead of hg commit) works perfectly.

i didn't read last part of documentation:
http://www.selenic.com/mercurial/hg.1.html#rebase


Comments

Post a Comment

Popular posts from this blog

SPSS keyboard combination alters encoding -

my question not have programming practical issue on spss. accident keyword combination cannot remember because did not intend press changed encoding in spss , text in data in different language english shown small boxes. nevertheless, when kind of analysis performed different language text shown in output. does know reason? tried change encoding did not produce result. first, @ edit > options , see whether setting unicode or locale. might fix it. if have text in multiple languages, want unicode. otherwise, may have specific locale set wrong. can change set locale, need know locale want use.
Read more

Add new record to the table by click on the button in Microsoft Access -

in ms access form want implement separate button, adds new record table. in order added button , attached button event: private sub btnaddrec_click() refresh codecontextobject on error resume next docmd.gotorecord , , acnewrec if err.number <> 0 btnaddrec.enabled = false end if end end sub everything ok when open window , click btnaddrec button, problem when first of perform navigation through existed records , after click on button. got runtime error: 2105: «you can't go specified record. may @ end of recordset» . how solve issue, need have ability add new record on click on specific button, no matter, have walked or not walked through records before. thanks. i created simple form field call description (and autonumber) , created button code follows click event. filled number of records , navigated through them, clicked addnewrec button. form navigated new record without issues. able click addnewrec button directly after
Read more

javascript - jQuery .height() return 0 when visible but non-0 when hidden -

i have problem here right opposite others: in jquery cannot height of element when it's visible, when hidden. have html code: <div id="filtering-filter-holder"> <div id="filtering-filter-holder-inner"></div> </div> basic css it: #filtering-filter-holder { display: none; position: absolute; width: 420px; min-height: 100px; padding: 5px 5px 5px 5px; background-color: #ffffff; border: 1px solid #164372; } and finally, js in document.ready(): $('div.filtering-filter-headline').mouseenter(function() { var el = $(this).parent().find('div.filtering-filter-content'); if ($('div#filtering-filter-holder').is(':visible')) { $('div#filtering-filter-holder-inner').stop(true, true).fadeout(300, function() { $('div#filtering-filter-holder-inner').html($(el).html()); var height = $('div#filtering-filter-holder-inner&#
Read more