Merge two mercurial repositories without breaking file history -


i need merge 2 mercurial repositories brand new, third repository.

project a:

1--2--3

project a':

4--5--6

what want :

project b:

1--2--3--4--5--6

history deleted project because of size limitation on server. don't have size limitation anymore. want bring

similar this question except need solution mercurial

you can , preserve history, changeset hashes change originals.
also, before go on, backups, backups, backups. make sure you're preserving originals in case goes horribly wrong, could.

off top of head have 2 options.
both start pulling project a' project using --force option allow pull in unrelated repository. e.g. 

hg pull --force projecta'

lets call new combined repo project a+.

rebase

then use rebase extension (which needs enabled in mercurial extension settings) rebase changeset 4 , it's descendents onto changeset 3. example: 

hg rebase --source 4 --dest 3

you might want use --keepbranches option, or might reset branch names of revision 3.
i've never used particular tactic myself don't see why wouldn't work.

convert

the second option, have used before, hg convert splicemap.
splicemap option lets specify new parents changesets, you'd able specify rev 3 rev 4's parent whereas right rev 4 presumably has no parent.

the splicemap text file, , contents formatted like:

revision-hash new-parent-hash

and each map in file separated new line.
have use full hash, friendly revision number or short hash won't work.

then use splicemap following:

hg convert --splicemap splicemap_filepath.txt projecta+ projectb

and spit out project b repo unified history.

depending on size of repos neither of these quick.


Comments

Post a Comment

Popular posts from this blog

php - failed to open stream: HTTP request failed! HTTP/1.0 400 Bad Request -

this code i'm using find latitude , longitude of place: function coords($address){ echo $url="http://maps.googleapis.com/maps/api/geocode/json?address=".$address; $json = file_get_contents(urlencode($url)); $data = json_decode($json, true); print_r($data['results'][0]['geometry']['location']['lat']); print_r($data['results'][0]['geometry']['location']['lng']); } however returns warning: failed open stream: http request failed! http/1.0 400 bad request if use above code in simple procedure works fine not in function. note: have tried curl_init()... method produced same result? instead of encoding whole url encode address part. following code work fine $add='jamshoro phase 2'; $url="http://maps.googleapis.com/maps/api/geocode/json?address=".urlencode($add); $json = file_get_contents($url); $data = json_decode($json, true); print_r($data['r
Read more

java - How to filter a backspace keyboard input -

i have code gives message when key number pressed: txtvalueofclause.addeventfilter(keyevent.key_typed, new eventhandler<keyevent>() { @override public void handle(keyevent t) { char ar[] = t.getcharacter().tochararray(); char ch = ar[t.getcharacter().tochararray().length - 1]; if (!(ch >= '0' && ch <= '9')) { system.out.println("the char entered not number"); t.consume(); } } }); now if press on wrong button , press backspace remove it, error message. how can add backspace input if statement? i have found answer: txtvalueofclause.addeventfilter(keyevent.key_typed, new eventhandler<keyevent>() { @override public void handle(keyevent t) { char ar[] = t.getcharacter().tochararray(); char ch = ar[t.getcharacter().tochar
Read more

java - Show Soft Keyboard when EditText Appears -

i have code in android app, alert dialog , keyboard, , when dialog shown want keyboard appear. not , not sure why? here code: final alertdialog.builder alert = new alertdialog.builder(this); alert.settitle("title"); alert.setmessage("message"); final edittext input = new edittext(this); input.setinputtype(inputtype.type_class_number); alert.setview(input); input.setonfocuschangelistener(new view.onfocuschangelistener() { @override public void onfocuschange(view v, boolean hasfocus) { if (hasfocus) { log.i(tag, "in focus"); inputmethodmanager inputmethodmanager = (inputmethodmanager) getsystemservice(context.input_method_service); inputmethodmanager.showsoftinput(input, inputmethodmanager.show_implicit); } } }); but keyboard not appear though edit text in focus, , tell appear why, doesn't come up? thanks in advance.
Read more