Hi Andrew,
Thank you for the explanation.
Thu, 29 Mar 2012 18:33:45 +0100 Andrew Haley <a...@redhat.com>:
> On 03/29/2012 06:19 PM, Ivan Maidanski wrote:
> > Hi Andrew,
> >
> > Thu, 29 Mar 2012 17:42:17 +0100 от Andrew Haley <a...@redhat.com>:
> >> On 03/29/2012 04:58 PM, Ivan Maidanski wrote:
> >>> It would be good to deprecate ChangeLog (used as commit log) as well.
> >>
> >> Why? I think this sentence is missing a "because ..." clause.
> >
> > Sorry for not explaining you how does git merge work. if you don't
> > have a special ChangeLog-aware merge driver installed (like
> > git-merge-changelog) you would almost always get merge conflicts
> > when pulling public modifications into a privately modified
> > ChangeLog file (same for rebasing). Every merge conflict requires
> > manual handling. If it is decided to move to VCS that simplifies
> > parallel development and branch merging, staying with old commit
> > policy (relying on ChangeLog) neutralizes that benefits.
>
> But that's what the git ChangeLog plugin is for. GNU projects have
> ChangeLogs;
The plugin is merely a workaround.
You say "GNU projects have X" Why? ("because" is missing)
You you put ChangeLog to ignored list and regenerate on tarball release via git
log would it be possible to say the project has ChangeLog or not?
> ... it's up to the VCS to keep up.
VCS could keep everything you put - e.g. auto-generated files and binaries -
it's up to you decide what's suitable for you when doing basic tasks.
E.g., Classpath repo has .svnignore files - if moved to git we could create
.gitignore by "ln -s" for each one (putting .svningore to .git exclude file) -
a working solution while keeping compatibility with SVN but will it be as
convenient as "native" .gitignore (e.g., in case of cloning)? (I guess there
probably exists some driver that emulates .gitignore based on .svn/cvsignore
present but I'm not sure.)
>
> > PS. I was surprised to hear that free Java developers prefer SVN to
> > Git.
>
> So was I. Who said that Java developers prefer SVN to Git?
>
> > How many free Java developers have been contributing to Classpath
> > over the passed 3-4 years? And which of them prefer to stay with CVS
> > and SVN?
>
> Well, I vastly prefer SVN to anything I've seen recently because of
> its branch handling, but maybe that's only me.
If you could be here more verbose or give a link - would be appreciated. Thanks.
> In any case, let's not
> have this mailing list degenerate into "my VCS versus yours" flame
> wars, just like every other list.
Agree but if there is a choice - augmented pros and cons are generally welcomed.
Regards.
>
> Andrew.
>
