git - Merge from upstream with no upstream history -

-

i have parent repo containing project, , sub repo based off project.

the parent repo has tagged releases, , sub repo based off 1 of these tags. example:

parent v1.0---v2.0---v3.0                 \                  child---[changes]

unfortunately when child repo created, parent history removed , repo reinitialised files added scratch. means none of parent repo's history contained within child repo, rather, 1 commit @ start indicate based off parent's v2.0 tag of v2.0 files git added.

is there way use git merge upstream changes parent (eg. v3.0 tag) child despite there being no parent history?

git pull tells me there no common commits, doesn't know start merging guess. need rewrite history of child add parent's history back?

obviously weird scenario , not 1 allow in future :)

then suggest rewrite history of child repo have full history v2.0 backwards.

i assume branch called master in both repos.

so first add remote parent repo , fetch it

$ cd /path/to/child/repo $ git remote add origin <url_or_path_for_parent_repo> $ git fetch origin

then find out sha of v2.0 tag (the 1 full history):

$ git rev-parse v2.0 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

and sha of first commit in master branch, i.e. 1 entire v2.0 history squashed 1 commit:

$ git checkout master $ git log --reverse --format=format:%h | head -n 1 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb

then, rewrite master branch swap parent bbbbb.. aaaaa... (please replace bbbbb... , aaaaa... strings in command below actual results of commands run above)

$ git filter-branch --parent-filter 'read p ; if [ "$p" = "-p bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" ]; echo "-p aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ; else echo "$p" ; fi' rewrite cccccccccccccccccccccccccccccccccccccccc (d/d) ref 'refs/heads/master' rewritten

after master branch should have replaced first squashed commit history of v2.0 tag.

if went wrong, can revert master branch original state with:

$ git reset --hard original/refs/heads/master

after have verified results , happy, can rid of original/refs/heads/master backup branch by:

$ git update-ref -d refs/original/refs/heads/master

after able merge v3.0 tag master branch of child repo in normal fashion.


Comments

Post a Comment

Popular posts from this blog

node.js - Mongoose: Cast to ObjectId failed for value on newly created object after setting the value -

-
this question has answer here: what's mongoose error cast objectid failed value xxx @ path “_id”? 7 answers even though has been asked many times because entity has no valid objectid field. i came across situation objectid set value can casted objectid still error. the schema: var serviceschema = parammongoose.schema({ servicename:{ type: parammongoose.schema.types.objectid , ref: 'servicenames',required:true } }); pseudo code: servicefromdb=new service({servicename:'some name'}); servicefromdb.servicename='000000000000000000000001'; servicefromdb.save(function(paramerror,paramdata){ if(paramerror){ console.log('but but...',servicefromdb,paramerror) } }); the output of code is: but but... { servicename: 000000000000000000000001, _id: 55079a90286f49280364f78b } { [casterror: cast objectid faile...
Read more

gradle error "Cannot convert the provided notation to a File or URI" -

-
i have defined 2 system properties in gradle.properties: systemprop.builddir=build systemprop.cfgdir=build\\cfg and have following task defined in build.gradle: task clean(group:'clean',description:'clean project') << { ant.sequential { delete(dir: system.properties.builddir) mkdir(dir: system.properties.builddir) delete(dir: system.properties.cfgdir) mkdir(dir: system.properties.cfgdir) } } this generates following error: execution failed task ':clean'. > cannot convert provided notation file or uri: {dir=build}. following types/formats supported: - string or charsequence path, e.g 'src/main/java' or '/usr/include' - string or charsequence uri, e.g 'file:/usr/include' - file instance. - uri or url instance. but equivalent block of code not generate error , works expected: task clean(group:'clean',description:'clean project') << { ...
Read more

python - NameError: name 'subprocess' is not defined -

-
i'm trying make rng website: http://jamesdotcom.com/?p=417 . when run following code: captureimage = subprocess.popen( [ "fswebcam", "-r", "356x292", "-d", "/dev/video0", "static.jpg", "--skip", "10" ], stdout=devnull, stderr=devnull) captureimage.communicate() i following error message: nameerror: name 'subprocess' not defined what should do? thanks have imported first? import subprocess captureimage = subprocess.popen(["fswebcam", ...) subprocess included in python standard library since python 2.4. should not necessary install it.
Read more