Re: [ jEdit-devel ] jEdit core and Git

[Vampire <Va...@jE...>]

Btw. when I didn't like Git much 2,5 years back, I then started later on to
play a bit with it and always thought it was a good decision.
It is the best VCS available currently in my opinion.
After playing with it a week or so I was already fallen in love with it. :-)
It is also useful for many other tasks, like wanting to try a new
configuration for some program, just do a "git init" "git add ." git commit
-m "initial commit" and then you can track your changes and also revert
them easily.
Or you want to see what jEdit changes in the settings directory, just do
the same sequence before running jEdit and look at the differences
afterwards.
You can immediately start a new VCS repository without the need for any
server or special software, just Git. :-)

And having seen that there some more responses while I wrote my long mail I
want to followup on two from Matthieu:

But if my work takes a long time the risk that the same code was modified
> by someone else is bigger then the merge will cause problems isn't it ?
>

If you do regular updates from the central repository and rebasing your
work, the changes are not that big usually and conflict resolution will be
done at that point.
Mergins should usually not be necessary as it would produce hard to follow
merge histories.
That is what rebasing is for to maintain a nice linear history.
If you start to use it, you will love it. :-)

>
> But I'm not sure about something : commit and update are slow on svn, but
> are we sure that git will be faster when updating or merging on the master ?
>

Yes, I stated some numbers in the big long mail above that I just measured.
To cut it short, checking out ONE revision of ONE branch with SF SVN needs
1,5 times the time the cloning of the complete Git repository needs.
And what I forget above when I spoke about the long cloning times for
git-svn, updating is of course also that slow as it checks out each
indiviual SVN revision and adds it to its local repository. So even if you
improve the situation by providing a ready-made Git repository with a
git-svn clone, updating and committing to Subversion will still be slow as
hell.