[cdt-releng-inbox] [Bug 316208] CDT git migration

[bugzilla-daemon@xxxxxxxxxxx]

https://bugs.eclipse.org/bugs/show_bug.cgi?id=316208
Product/Component: CDT / cdt-releng

James Blackburn <jamesblackburn+eclipse@xxxxxxxxx> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #197678|0                           |1
        is obsolete|                            |

--- Comment #64 from James Blackburn <jamesblackburn+eclipse@xxxxxxxxx> 2011-06-15 16:02:23 EDT ---
Created attachment 198050
  --> https://bugs.eclipse.org/bugs/attachment.cgi?id=198050
recipe.txt

8.1) Delete unwanted branches
   git branch -D ScannerDiscovery61

9) Graft in history from other projects

9.1   Add DSF
   git remote add dsf ../org.eclipse.dd.dsf
   git fetch dsf master

   #Find Pawel's first commit of DSF into CDT
      git log --pretty=oneline |grep "Migrated DSF and DSF-GDB to the CDT
project." |tail -n 1|awk '{print $1}' |tr -d '\n' > grafts
      echo -n " " >> grafts
   #It still needs to point at its parent:
      git log --pretty=oneline |grep "Migrated DSF and DSF-GDB to the CDT
project." |tail -n 1|awk '{print $1}' |xargs git rev-list -n 2|tail -n 1 |tr -d
'\n' >> grafts
   #Graft the dsf DAG into CDT. This is the last commit to DSF before Pawel's
commit to CDT.  The SHA-1 won't change as DSF is archived and I'll only import
it once :)
      echo " c1e6da229b8ffcea160498f034bfa6bc8ff6f230" >> grafts
   #Move the graft in - we need to do this last as the graft will mess up the
git log's above
      cat grafts >> .git/info/grafts

   Now check the history with gitk or likewise.  git show <commit_id> should
show it was a merge.

9.2   Add the traditional-memory history:
      git remote add memory ../org.eclipse.dd.memory/
      git fetch memory master
      git log --pretty=oneline |grep "DSDP-DD -> CDT initial commit" |tail -n
1|awk '{print $1}' |tr -d '\n' > grafts
      echo -n " " >> grafts
      git log --pretty=oneline |grep "DSDP-DD -> CDT initial commit" |tail -n
1|awk '{print $1}' |xargs git rev-list -n 2|tail -n 1 |tr -d '\n' >> grafts
      echo " 8a526a1b6d440e8078cb51f345dfa914615b6a6c" >> grafts
      cat grafts >> .git/info/grafts

11) Make the grafts permanent
      git fast-export --all | (mkdir ../org.eclipse.cdt2 && cd
../org.eclipse.cdt2 && git init && git fast-import)

-- 
Configure bugmail: https://bugs.eclipse.org/bugs/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.