Re: [gentoo-science] Re: overlay move to git

[My Th <rei4dan@gmail.com>]

Yes, it can be shortened, but basically it goes along with the same
lines as your work flow and in addition:
- use echangelog to write ChangeLog
- use repoman to check ebuilds
- create temporary branch for easier coping with others commits

The last one (using git rebase) lets avoid master branch merge commits
(like the one in your commit).

I also started to use git just recently (a week ago), so I might do some
unnecessary things or maybe this work flow can be simplified.. If you
see were and how, I would happily take an advice.


Cheers,
Reinis

P , 2009-02-23 09:08 +0200, Flammie Pirinen rakstīja:
> 2009-02-22, My Th sanoi:
> 
> > There is my work flow with git on Science overlay.
> 
> > >$ git clone git+ssh://git@git.overlays.gentoo.org/proj/sci.git
> > >$ git branch $NAME
> > >$ git checkout $NAME
> > ... edit ...
> > >$ git add $FILES
> > >$ export ECHANGELOG_USER="Your Name <your.name@gentoo.org>"
> > >$ echangelog
> > >$ ebuild *.ebuild digest
> > >$ repoman -p full
> > >$ git add $FILES
> > >$ git status
> > >$ git commit
> > >$ git push --dry-run -v origin HEAD:master
> > >$ git checkout master
> > >$ git pull origin
> > >$ git checkout $NAME
> > >$ git rebase master
> > >$ git push --dry-run -v origin HEAD:master
> > >$ git push -v origin HEAD:master
> > >$ git checkout master
> > >$ git pull origin
> > >$ git branch -d $NAME
> 
> I wonder if this short and simple work flow is really all necessary. I
> have to admit I have no prior experience with DVCS’s and in last thread
> when I asked advice no one replied, so I just did something along the
> lines of:
> 
> $ git pull
> $ vim
> $ git commit
> $ git push
> 
> During my last update. It seemed like it worked though? Will something
> break soon if I continue to use this set of commands? What is the work
> flow for trivial version bump, if so? I would hope that I do not have
> to execute some 22 commands every time I bump my packages from now on.
>