Re: git, ChangeLog

[Lars Ræder Clausen <lars raeder dk>]

On Sat, 2009-04-18 at 11:32 +0200, Hans Breuer wrote:
> At 18.04.2009 10:06, Steffen Macke wrote:
> > Hi,
> >
> > the switch from svn to to git was mentioned on the mailing list before.
>  > [...]
>  >
> > Apologies, if I missed something. I'm a git beginner :-)
> Me too ;) Thus I'm working on some nice win32 git gui and am writing down 
> what I learn along the way. See: http://hans.breuer.org/gtk/gtk-git.html
>
> > More information on the GNOME git usage is available here:
> >
> > http://live.gnome.org/Git
> >
> > Lars: Would it be a lot of effort for you to switch the ChangeLog daemon
> > from svn to git?
> Of course it should not just try to diff the ChangeLog because that is to 
> be deprecated: http://live.gnome.org/Git/ChangeLog
>
> The main reason for *not* using the ChangeLog is it producing conflicts 
> with almost every merge you try.

Possibly more so with git, as there can be a tendency to check your
changes in less often than with SVN; I never found ChangeLog conflicts
to be a problem with Dia, certainly not an "almost every merge" case.  I
liked having the commit comments be closer to the code than the
ChangeLog.  But I'll take a look at updating nemo to use git.

-Lars