PLD Linux Distribution

This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.
====== CVS to GIT cheatsheet ======

===== Changes to Developer =====

First you should get yourself git based tools:
<code>
poldek --up -u rpm-build-tools
mv rpm rpm.cvs
builder --init-rpm-dir
</code>

===== Actions =====

==== add new package ====

  * CVS: ''../builder -a PKG'' or ''cvs add PKGDIR''
  * GIT: ''builder -a PKG'' or ''slug.py init PKG''

==== rename package ====

  * CVS: send rename request to cvsadmin@                                                                                                                   
  * GIT: ''ssh git@git.pld-linux.org move PKG1 PKG2''

==== delete package ====

  * CVS: remove all sources from cvs                                                                                                                        
  * GIT: ask admin to run ''ssh git@git.pld-linux.org trash PKG''


==== update from remote ==== 

  * CVS: ''cvs up''
  * GIT: ''%%git pull --rebase%%''

==== checkin single file ==== 

  * CVS: ''cvs ci file.foo''
  * GIT: ''git add file.foo; git commit; git push''


==== checkin all changes ====

  * CVS: ''cvs ci''
  * GIT: ''git commit -a; git push''

==== find string from all packages ==== 

  * CVS: ''grep -r oauth_ SPECS''
  * GIT: ''slug.py checkout -b BRANCH; grep */*.spec''

====  list all pkgs ====

  * CVS: ''cvs ls packages''
  * GIT: ''slug.py list''

==== see old patches ====

  * CVS: look into ''Attic/'' in cvsweb
  * GIT: ''%%git log --pretty=format: --name-only --diff-filter=D%%''

==== restore old removed file ====

  * CVS: look into ''Attic/'' in cvsweb and \\ ''cvs up -jHEAD -j$DEAD_REV'' and commit                                                                     
  * GIT: 
  - get sha: ''%%git log -- FILE%%''
  - get contents: ''git show HASH:FILE''

==== convert last autotag into branch ==== 

  * CVS: <code>./builder -T ICU_4_8 -r auto-th-xxx icu.spec
./builder -g -r ICU_4_8 icu.spec
cvs tag -b -F ICU_4_8 icu.spec
cvs ci -m '- ...' icu.spec</code>  

  * GIT: <code>./builder -B ICU_4_8 -r   auto-th-xxx icu.spec
git push origin ICU_4_8
git checkout ICU_4_8</code>

====  delete remote branch ==== 
  * CVS: <code>cvs branch -d BRANCH</code>
  * GIT: <code>git push origin :BRANCH</code>