FreeSource - AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches

2008-04-01 17:44:31

�� /Alt Linux / Sisyphus / devel / git / Some Dest Repos Via Branches �� 2008-04-01 17:44:31 � 2008-04-02 09:20:10

��:

�� altlinux.org. �� freesource.info ��.

$ git init-db| || $ git add . $ git commit -m 'Initial commit'| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=0.png||
|| �� | $ git branch upstream $ git branch srpm $ git branch srpm-4.0 | http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=1.png ||
|| �� upstream| $ git checkout upstream $ git add . $ git commit -m 'Upstream initial commit' $ git tag ser2net-2.3| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=2.png||
|| �� srpm| $ git checkout srpm $ git add . $ git commit -m 'Initial spec and initscript'| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=3.png||
|| �� srpm � upstream, �� , �� Sisyphus| $ git checkout srpm $ git merge ser2net-2.3 $ git commit -a -m 'First build for Sisyphus' $ git tag srpm-ser2net-2.3 || �� srpm-4.0 � srpm, �� , �� branch/4.0| $ git checkout srpm-4.0
$ git merge srpm-ser2net-2.3
$ git commit -a -m 'Backport to branch/4.0'
$ git tag srpm-4.0-ser2net-2.3
|| �� | $ git checkout upstream $ git commit -a -m 'Upstream update' $ git tag ser2net-2.4 | http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=6.png||
|| �� srpm � upstream, �� , �� Sisyphus| $ git checkout srpm $ git merge ser2net-2.4 $ git commit -a -m 'new version' $ git tag srpm-ser2net-2.4 || �� srpm � upstream, �� , �� branch/4.0| $ git checkout srpm-4.0
$ git merge srpm-ser2net-2.4
$ git commit -a -m 'new backport to branch/4.0'
$ git tag srpm-4.0-ser2net-2.4
�� , � �� , �� git reset --hard HEAD^. �� --hard �� --soft, �� , �� , �� , �� . �� HEAD^ �� , �� .

��:

$ git-init-db| || $ git-add . $ git-commit -m 'Initial commit'| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=0.png||
|| �� | $ git-branch upstream $ git-branch srpm $ git-branch srpm-4.0 | http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=1.png ||
|| �� upstream| $ git-checkout upstream $ git-add . $ git-commit -m 'Upstream initial commit' $ git-tag ser2net-2.3| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=2.png||
|| �� srpm| $ git-checkout srpm $ git-add . $ git-commit -m 'Initial spec and initscript'| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=3.png||
|| �� srpm � upstream, �� , �� Sisyphus| $ git-checkout srpm $ git-merge ser2net-2.3 $ git-commit -a -m 'First build for Sisyphus' $ git-tag srpm-ser2net-2.3 || �� srpm-4.0 � srpm, �� , �� branch/4.0| $ git-checkout srpm-4.0
$ git-merge srpm-ser2net-2.3
$ git-commit -a -m 'Backport to branch/4.0'
$ git-tag srpm-4.0-ser2net-2.3
|| �� | $ git-checkout upstream $ git-commit -a -m 'Upstream update' $ git-tag ser2net-2.4 | http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=6.png||
|| �� srpm � upstream, �� , �� Sisyphus| $ git-checkout srpm $ git-merge ser2net-2.4 $ git-commit -a -m 'new version' $ git-tag srpm-ser2net-2.4 || �� srpm � upstream, �� , �� branch/4.0| $ git-checkout srpm-4.0
$ git-merge srpm-ser2net-2.4
$ git-commit -a -m 'new backport to branch/4.0'
$ git-tag srpm-4.0-ser2net-2.4
�� , � �� , �� git-reset --hard HEAD^. �� --hard �� --soft, �� , �� , �� , �� . �� HEAD^ �� , �� .

2008-04-01 17:40:36

�� /Alt Linux / Sisyphus / devel / git / Some Dest Repos Via Branches �� 2008-04-01 17:40:36 � 2008-04-01 17:44:31

��:

$ git-tag ser2net-2.3| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=2.png||
$ git-commit -m 'Initial spec and initscript'| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=3.png||
$ rsync -va --partial --stats --delete-after -e ssh /RPM/SRPMS/ser2net-2.3-alt1.src.rpm devel:/incoming/Sisyphus/| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=4.png||
$ rsync -va --partial --stats --delete-after -e ssh /RPM/SRPMS/ser2net-2.3-alt0.M40.src.rpm devel:/incoming/updates/4.0/|http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=5.png||
$ rsync -va --partial --stats --delete-after -e ssh /RPM/SRPMS/ser2net-2.4-alt0.M40.src.rpm devel:/incoming/updates/4.0/| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=8.png||
�� , � �� , �� git-reset --hard HEAD^. �� --hard �� --soft, �� , �� , �� , �� . �� HEAD^ �� , �� .

��:

$ git-tag ser2net-2.3| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=3.png||
$ git-commit -m 'Initial spec and initscript'| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=4.png||
$ rsync -va --partial --stats --delete-after -e ssh /RPM/SRPMS/ser2net-2.3-alt1.src.rpm devel:/incoming/Sisyphus/| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=5.png||
$ rsync -va --partial --stats --delete-after -e ssh /RPM/SRPMS/ser2net-2.3-alt0.M40.src.rpm devel:/incoming/updates/4.0/|http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=6.png||
$ rsync -va --partial --stats --delete-after -e ssh /RPM/SRPMS/ser2net-2.4-alt0.M40.src.rpm devel:/incoming/updates/4.0/| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=7.png||
�� , � �� , �� git-reset --hard HEAD^. �� --hard �� --soft, �� , �� , ��, �� . �� HEAD^ �� , �� .

2008-04-01 17:19:28

�� /Alt Linux / Sisyphus / devel / git / Some Dest Repos Via Branches �� 2008-04-01 17:19:28 � 2008-04-01 17:40:36

��:

�� apt-�� git � ��

|| ��|��|�� gitk --all ||
|| �� | $ mkdir ser2net $ cd ser2net $ git-init-db| ||
|| �� master �� .gear/rules, �� srpm| $ mkdir .gear $ cat > .gear/rules << EOF > copy: *.init > tar: ser2net > EOF $ git-add . $ git-commit -m 'Initial commit'| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=0.png||
|| �� | $ git-branch upstream $ git-branch srpm $ git-branch srpm-4.0 | http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=1.png ||
|| �� upstream| $ git-checkout upstream $ cp ~/download/ser2net-2.3.tar.gz . $ tar -zxf ser2net-2.3.tar.gz $ rm -f ser2net-2.3.tar.gz $ mv ser2net-2.3 ser2net $ git-add . $ git-commit -m 'Upstream initial commit' $ git-tag ser2net-2.3| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=3.png||
|| �� srpm| $ git-checkout srpm $ vim ser2net.init $ vim ser2net.spec $ git-add . $ git-commit -m 'Initial spec and initscript'| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=4.png||
|| �� srpm � upstream, �� , �� Sisyphus| $ git-checkout srpm $ git-merge ser2net-2.3 $ vim ser2net.spec # �� release $ add_changelog ser2net.spec $ vim ser2net.spec # �� changelog $ gear --commit --hasher — hsh # �� $ git-commit -a -m 'First build for Sisyphus' $ git-tag srpm-ser2net-2.3 $ gear --rpmbuild — rpm -bs --sign --nodeps $ rsync -va --partial --stats --delete-after -e ssh ~/RPM/SRPMS/ser2net-2.3-alt1.src.rpm devel:/incoming/Sisyphus/| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=5.png||
|| �� srpm-4.0 � srpm, �� , �� branch/4.0| $ git-checkout srpm-4.0 $ git-merge srpm-ser2net-2.3 $ vim ser2net.spec # �� release $ add_changelog ser2net.spec $ vim ser2net.spec # �� changelog $ gear --commit --hasher — hsh # �� $ git-commit -a -m 'Backport to branch/4.0' $ git-tag srpm-4.0-ser2net-2.3 $ gear --rpmbuild — rpm -bs --sign --nodeps $ rsync -va --partial --stats --delete-after -e ssh ~/RPM/SRPMS/ser2net-2.3-alt0.M40.src.rpm devel:/incoming/updates/4.0/|http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=6.png||
|| �� | $ git-checkout upstream $ gear-update ~/download/ser2net-2.4.tar.gz ser2net $ git-commit -a -m 'Upstream update' $ git-tag ser2net-2.4 | http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=6.png||
|| �� srpm � upstream, �� , �� Sisyphus| $ git-checkout srpm $ git-merge ser2net-2.4 $ vim ser2net.spec # �� release $ add_changelog ser2net.spec $ vim ser2net.spec # �� changelog $ gear --commit --hasher — hsh # �� $ git-commit -a -m 'new version' $ git-tag srpm-ser2net-2.4 $ gear --rpmbuild — rpm -bs --sign --nodeps $ rsync -va --partial --stats --delete-after -e ssh ~/RPM/SRPMS/ser2net-2.4-alt1.src.rpm devel:/incoming/Sisyphus/| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=7.png||
|| �� srpm � upstream, �� , �� branch/4.0| $ git-checkout srpm-4.0 $ git-merge srpm-ser2net-2.4 $ vim ser2net.spec # �� release $ add_changelog ser2net.spec $ vim ser2net.spec # �� changelog $ gear --commit --hasher — hsh # �� $ git-commit -a -m 'new backport to branch/4.0' $ git-tag srpm-4.0-ser2net-2.4 $ gear --rpmbuild — rpm -bs --sign --nodeps $ rsync -va --partial --stats --delete-after -e ssh ~/RPM/SRPMS/ser2net-2.4-alt0.M40.src.rpm devel:/incoming/updates/4.0/| http://freesource.info/wiki/AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches/files?get=7.png||
�� , � �� , �� git-reset --hard HEAD^. �� --hard �� --soft, �� , �� , ��, �� . �� HEAD^ �� , �� .

��:

�� apt-�� git � ��
|| | ||
|| | ||

FreeSource - AltLinux/Sisyphus/devel/git/SomeDestReposViaBranches

2008-04-01 17:44:31

2008-04-01 17:40:36

2008-04-01 17:19:28

��������� ������ ��� ���������� apt-������������ � ������� ������� git � ���������

�� apt-�� git � ��