rebase - Git change parent commit rev -


a colleague of mine checked out commit correct_parent, made changes based on correct_parent, , somehow mistakenly committed wrong parent commit rev wrong_parent instead of correct_parent (i'm not sure how managed that). let's call commit bad_commit.

a whole bunch of new commits based on bad_commit, including new merge commits, it's not linear structure, more diamonds. being merged single branch again. let's call bad_branch.

i want recreate bad_commit correct parent commit correct_parent, , follow-up commits well.

i'm not sure how that. somehow git rebase , --strategy ours or so. note not rebase because diff between wrong_parent , bad_commit not sense-full, don't want apply patch.

a picture:

wrong_parent -> bad_commit (based on correct_parent) -> ...... -> bad_branch head

i want:

correct_parent -> bad_commit (merge strategy: take bad_commit) -> .... -> fixed_branch

this can fixed graft file, made permanent using git filter-branch.

to set bad repo:

git init echo > file && git add file && git commit -m "good parent" echo b > file && git add file && git commit -m "bad parent" echo c > file && git add file && git commit -m "child" file

and appears in git log --oneline as

 f6e3133 child 4dc60b6 bad parent 7b5da8a parent

now pretend "good parent" parent of "child":

echo `git rev-parse @ @~2` > .git/info/grafts

and check git log --oneline again:

 f6e3133 child 7b5da8a parent

now make permanent:

git filter-branch

and check git log --oneline third time:

 87b8fc8 child 7b5da8a parent

you see child got new hash. that's because commit re-written proper parent. parent didn't new hash, because unchanged. children of "child" have been rewritten well.

finally, clean up:

rm .git/info/grafts

Comments

Post a Comment

Popular posts from this blog

searchKeyword not working in AngularJS filter -

i writing app using angularjs on front end. want search through table word/field; 1 search box everything. according article here: http://hello-angularjs.appspot.com/searchtable can use filter: searchkeyword this. this code, , not working expected. <label>search: <input ng-model="searchkeyword"></label> <table ng-repeat="post in posts | orderby: sort | filter: searchkeyword"> <tr> <td> {{index(post)}} </td> <td> {{post.title}} </td> <td> {{post.author}} </td> <td> {{post.content}} </td> <td> {{post.date | date: "d/m/yyyy"}} </td> </tr> </table> what should do? thank you try this: controller $scope.posts = [ {title:'title one', author:'author one', content: 'content one'}, {title:'title two', author:'author two', content: 'cont...
Read more

sequelize.js - Sequelize: sort by enum cases -

i have model ( article ) field (the name type ) of type enum('source', 'translated') , return 1 article ordered type field. source articles should returned before translated articles. like: article.findone(order: [ { type: [ 'source', 'translated' ] } ]); unfortunately there appears no built-in solution sorting enums. instead have sort by case , couldn't find documentation on how sequelize. what conventional approach here? sorting case hard in sequelize, sort field (the second answer in linked post) should possible: order: sequelize.fn('field', sequelize.col('type'), 'source', 'translated') it's supported mysql far know though
Read more

user interface - how to replace an ongoing process of image capture from another process call over the same ImageLabel in python's GUI TKinter -

i trying use following code create interactive gui changes color-space(hsv, rbg, grayscale etc) on event of button click. display opencv video in tkinter using multiprocessing being new python having problems multiprocessing , attempts on making gui change it's color space on button clicks hangs entire system. on it's implementation highly appreciated. thankyou. below code: import cv2 pil import image,imagetk import tkinter tk import numpy np multiprocessing import process , queue def quit_it(root,process): root.destroy() process.terminate() def black_andwhite(root,process): process.terminate p=process(target=capture_image, args=(5,queue, )) p.start() root.after(0, func=lambda: update_all(root, image_label, queue)) def update_image(image_label, queue): frame = queue.get() = image.fromarray(frame) b = imagetk.photoimage(image=a) image_label.configure(image=b) image_label._image_cache = b root.update() def update_all(root...
Read more