On 10/3/10, Kreuvf wrote:
> buginator wrote:
>> As you may have noticed, SVN access has been terminated.
> ...
>> We have decided to start using git.
> Where, when, who is "we" and what exactly led to this decision right now?
Actually, this has been in the making for a long time, it just came
about when I started to use git instead of hg (which I used for
qt-trunk), for creating the new branch.
While having a reliable syncbot would be great, the issue there is we
lose history, as can be seen by previous 'mass merges' that were done.
The other issue with svn, is our repo was getting huge. Doing merges
was pretty much impossible without getting some kind of remote SVN
error.
Once it was deemed that the windows version of git was 'stable enough'
(NOTE! Don't use tortoiseGit, they have a big warning on their site
about the issues) then it was pretty much a done deal. I am currently
using git-gui and gitk (comes with msysgit) and that is pretty much
what most people need, though, you still need to drop down to the
shell to fix merges and more advanced commands.
Also note, you can use bzr or hg as a git frontend, so use whatever is
best for you.
The workflow pattern is something like this...
git pull (like a svn update)
{do whatever}
git commit (this means that you save your changes, but this doesn't
apply said changes to gitorious yet)
{you are now free to do whatever, or edit the commits you just made,
in case you discovered a problem. If so, then you do git reset --soft
HEAD^ and all your changes from the last commit will be uncommited.
Fix the issue, and then do git commit again.}
Now, you send the changes to gitorious via:
git push (svn commit)
{continue on doing whatever}
Just a note, if you push to gitorious, DON'T edit those commits and
push again, you will cause pain/grief for everyone!
You should just revert changes in your local checkout, and fix it, do
the commit again, and THEN push. Don't rewrite history once it is
pushed!
_______________________________________________
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev
