How to create a git patch from the differences between 2 repos but keep the history? -

-

the code in our repo copy of download of source rather git clone (the repo wasn't available @ time) when doing git blame, lot of files author downloaded code.

we have since made lot of changes code.

but have access original repo, i'd add git history original repo. wondered if possible?

if do

cd originalrepo git checkout taggedversionineed git log

copy last commit hash

cd ../ourcode git remote add upstream ../originalrepo git fetch upstream git checkout develop git diff taggedversionhash

it happily shows differences between 2 without history.

if try

git format-patch taggedversionhash --stdout > ../mypatch.patch

it seems add commits, not code differences. when do

git checkout -b feature_updatehistory taggedversionhash git < ../mypatch.patch

i lots , lots of 

applying: commitmessage error: patch failed: filename:387 error: filename: patch not apply patch failed @ 0001 commitmessage copy of patch failed found in:    /home/username/www/mycode/.git/rebase-apply/patch when have resolved problem, run "git --continue". if prefer skip patch, run "git --skip" instead. restore original branch , stop patching, run "git --abort".

the files same, our file downloaded source, commit in patch original repo.

any ideas? there better way this?

have tried cherry-pick changes branch lost history onto branch cloned available repo?


Comments

Post a Comment

Popular posts from this blog

dns - How To Use Custom Nameserver On Free Cloudflare? -

-
i have problem. i own small hosting company. trying add cloudflare site free cdn. problem when sign have change nameservers nameservers. have nameserver dns set through godaddy, how add them cloudflare? main site uses company's nameservers whenever add them site goes offline. when go cloudflare's dns records click on dropdown, click ns, , there's 2 boxes 'name' , 'nameserver'. mean input 'ns1' 'name' , 'ns1.domain.com' 'nameserver'? input server's ip addresses? is there way of accomplishing free version of cloudflare? that impossible. option have custom name servers available on business , enterprise. see https://www.cloudflare.com/plans . also, might mistaken. must change name servers in domain register settings, not on cloudflare.
Read more

python - Pygame screen.blit not working -

-
in program creating in python/pygame, screen.blit not working. in other programs have made, screen.blit works. error: traceback (most recent call last): file "c:...\main.py", line 46, in <module> screen.blit(sight.image, sight.rect) attributeerror: 'int' object has no attribute 'blit' the error in question caused screen variable being allocated integer instead of pygame.surface() object.perhaps accidentally rewrote variable somewhere? from can make of doing, seems stating position of blit full rect instead of coordinate. when do: screen.blit(sight.image,sight.rect) what program seeing is: screen.blit(sight.image,(sight.rect.x,sight.rect.y,sight.rect.width,sight.rect.height)) i assuming don't intend this. remember rect object consists of position, width , height. to correct code, put (sight.rect.x,sight.rect.y) location goes instead this: screen.blit(sight.image,(sight.rect.x,sight.rect.y)) the .x , .y corres
Read more

c# - Web API response xml language -

-
i having simple post url clients send post request. http://mydomain.com/requests/request post data: <request> <orderid>1e008921</orderid> <ordername>mc1</ordername> </request> to respond sending them xml <srequest> <requestedby>client 1 </requestedby> <requestname>test name</requestname> <requeststatus>success</requeststatus> <srequest> now client wants above xml in different language (say french ) how handle ? how send response language preference in web api ? specially post scenario ? (append language string ? or best practices ?) i suggest either include in url: http://mydomain.com/fr/requests/request or use http header accept-language . read more in answer to: good way changing language resources dynamically request
Read more