This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
cvs2git [2012-07-03 13:15] draenog [actions map] |
cvs2git [2012-07-30 20:47] draenog [actions map] |
||
---|---|---|---|
Line 1: | Line 1: | ||
===== Changes to Developer ===== | ===== Changes to Developer ===== | ||
- | First you should get yourself git based tools. | + | First you should get yourself git based tools: |
- | - **builder** : FIXME should we build package here? | + | <code> |
- | - ... | + | poldek -i rpm-build-tools-4.5-3 git-core |
+ | mv rpm rpm.cvs | ||
+ | builder --init-rpm-dir | ||
+ | </code> | ||
Line 10: | Line 14: | ||
^ Action ^ Before (CVS) ^ After (Git) ^ | ^ 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> | | | 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>slug.py move PKG1 PKG2</code> | | + | | rename package | send rename request to cvsadmin@ | <code>ssh git@git.pld-linux.org move PKG1 PKG2</code> | |
- | | delete package | remove all sources from cvs | ask admin to run<code>ssh git@pld-linux.org trash PKG</code> | | + | | delete package | remove all sources from cvs | ask admin to run<code>ssh git@git.pld-linux.org trash PKG</code> | |
| update from remote | <code>cvs up</code> | <code>git pull --rebase</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 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> | | | 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> | | | + | | 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> | | | 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> | | | 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> | | | 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 | | convert last autotag into branch | <code>./builder -T ICU_4_8 -r auto-th-xxx icu.spec | ||
- | ./builder -g -r ICU_4_8 icu.speccvs tag -b -F ICU_4_8 icu.spec | + | ./builder -g -r ICU_4_8 icu.spec |
- | cvs ci -m '- ...' icu.spec</code> | | | + | 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 | ||
+ | git push origin ICU_4_8 | ||
+ | git checkout ICU_4_8</code> | | ||