reformat to something readable --- https://www.pld-linux.org/cvs2git?rev=1366450862 +++ https://www.pld-linux.org/cvs2git @@ -1,4 +1,6 @@ + ====== CVS to GIT cheatsheet ====== + ===== Changes to Developer ===== First you should get yourself git based tools: <code> @@ -6,27 +8,74 @@ mv rpm rpm.cvs builder --init-rpm-dir </code> + ===== Actions ===== + ==== add new package ==== - ==== actions map ==== + * CVS: ''../builder -a PKG'' or ''cvs add PKGDIR'' + * GIT: ''builder -a PKG'' or ''slug.py init PKG'' - ^ Action ^ Before (CVS) ^ After (Git) ^ - | add new package | <code>../builder -a PKG</code> or <code>cvs add PKGDIR</code> | <code>builder -a PKG</code> or <code>slug.py init PKG</code> | - | rename package | send rename request to cvsadmin@ | <code>ssh [email protected] move PKG1 PKG2</code> | - | delete package | remove all sources from cvs | ask admin to run<code>ssh [email protected] trash PKG</code> | - | update from remote | <code>cvs up</code> | <code>git pull --rebase</code> | - | checkin single file | <code>cvs ci file.foo</code> | <code>git add file.foo; git commit; git push</code> | - | checkin all changes | <code>cvs ci</code> | <code>git commit -a; git push</code> | - | find string from all packages | <code>grep -r oauth_ SPECS</code> | <code>slug.py checkout -b BRANCH; grep */*.spec</code> | - | list all pkgs | <code>cvs ls packages</code> |<code>slug.py list</code> | - | see old patches | look into ''Attic/'' in cvsweb | <code>git log --pretty=format: --name-only --diff-filter=D</code> | - | restore old removed file | look into ''Attic/'' in cvsweb and \\ ''cvs up -jHEAD -j$DEAD_REV'' and commit | 1. get sha:<code>git log -- FILE</code>2. get contents:<code>git show HASH:FILE</code> | - | convert last autotag into branch | <code>./builder -T ICU_4_8 -r auto-th-xxx icu.spec + ==== rename package ==== + + * CVS: send rename request to cvsadmin@ + * GIT: ''ssh [email protected] move PKG1 PKG2'' + + ==== delete package ==== + + * CVS: remove all sources from cvs + * GIT: ask admin to run ''ssh [email protected] 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> |<code>./builder -B ICU_4_8 -r auto-th-xxx 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 | <code>cvs branch -d BRANCH</code> | <code>git push origin :BRANCH</code> | + git checkout ICU_4_8</code> + ==== delete remote branch ==== + * CVS: <code>cvs branch -d BRANCH</code> + * GIT: <code>git push origin :BRANCH</code>
Diff URL: https://www.pld-linux.org/cvs2git?do=diff&r1=1366450862&r2=1366451956 -- This mail was generated by DokuWiki at https://www.pld-linux.org/ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
