git - Join old and new repo, created by copying files (not cloning), preserving commit history -


to simplify things have following structure in git old_repo "subpath":

subpath/old_commit_1 subpath/old_commit_2 subpath/old_commit_latest

i decided move new_repo , copied latest version of "subpath" (from old_commit_latest) without commit history.

so new_repo has "subpath" , bunch of new commits made it:

subpath/new_commit_subpath_added # added subpath here subpath/new_commit_1 subpath/new_commit_2 subpath/new_commit_latest

now need migrate history old_repo new_repo following tree in new_repo:

subpath/old_commit_1 subpath/old_commit_2 subpath/old_commit_latest subpath/new_commit_1 subpath/new_commit_2 subpath/new_commit_latest

how do that?

i need master branch, have lots of files there in same situation. , subpath , filenames in old_repo matches ones in new_repo.

i guess need create patches subpaths in old_repo, rollback first commit each subpath in new_repo, remove first commit, apply patches , rebase new commits on it. not sure how all. appreciate help.

preparations.

you should have both new , old versions available valid repositories. old version should better on local machine, new can on local or remote (say, github).

it's idea have backups of both repos , projects.

i assume last commit of old version first commit of new. if that's not so:

  1. reset newer version it's first commit.
  2. delete files in older version project folder except .git, including .gitignore , other git settings.
  3. copy files newer older version project folder.
  4. save changes new commit on old/master.

joining repositories

# go old repo folder cd path/to/old # add new repo remote git add remote newrepo path/to/new/.git  #check it's added git remote show newrepo  #fetch data new git fetch newrepo  #create branch "new", tracking git checkout -b new newrepo/master  #merge changes old master git checkout master git merge newrepo  #an editor open merge commit message. if you've done preparations, there should no merge conflicts. #this should show complete history git log --oneline

now have joint history , latest commits in old project directory.


Comments

Post a Comment

Popular posts from this blog

c++ - Difference between pre and post decrement in recursive function argument -

i have following sample code used pre-decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(--c); cout << c << endl; return; } } this function give output input 4 : dp3 dp2 dp1 dp0 0 1 2 3 but when use post decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(c--); cout << c << endl; return; } } output goes in infinite loop dp4 can explain me in detail why happens ? this happens because function(c--) called same value of c , when finishes c decremented. recursively called, hence called same value no chance of return , hit stack overflow error. assume this, int x = 1, y = 0; y = x++ result y == 1 , x == 2. if y = ++x , bot x , y 2.
Read more

php - Nothing but 'run(); ' when browsing to my local project, how do I fix this? -

i added new project. made mistake in projectname.conf file in sites-available apache2, led me reinstalling apache2. after reinstalling , re-enabling projects on every page of every project .. <body> run(); </body> .. i've run composer update, restarted service, restarted pc, checked config files, tried disabling new project. there nothing in error log, , access.log: 127.0.0.1 - - [15/may/2015:01:40:47 +0200] "get / http/1.1" 304 181 "-" "mozilla/5.0 (x11; ubuntu; linux x86_64; rv:38.0) gecko/20100101 firefox/38.0" maybe i'm forgetting apache2 reinstall? don't think did different last time installed it. looks haven't setup php correctly. take @ this great guide , maybe you're forgetting link php config apache2.
Read more

php - How can I echo out this array? -

i don't know how go grabbing data in variable , put foreach loop. class tree{ private $info = array( array('name'=>'jim','state'=>'nu','company'=>'nu','phone'=>array('cell'=>'5615111111','office'=>'5611111111'),'email'=>array('primary'=>'exs@example.com','ex@there.com')), array('name'=>'joe smith','city'=>'phoenix','phone'=>'4805551111','email'=>'jsmith@some_email.com'), array('name'=>'john doe','city'=>'chandler','company'=>'doe co.','email'=>array('jdoe@gmail.com','personal'=>'email@email.com'),'phone'=>'6025550002') ); } if you're inside of class, can access private variable using $this->variablename . example, i...
Read more