Re: [fvwmorg/fvwm] 64d424: DEVELOPERS: mention NEWS file

2016-10-24 Thread Dominik Vogt 
On Tue, Oct 25, 2016 at 12:27:40AM +0100, Thomas Adam wrote:
> On Tue, Oct 25, 2016 at 12:23:54AM +0100, Dominik Vogt wrote:
> > On Mon, Oct 24, 2016 at 11:54:00PM +0100, Thomas Adam wrote:
> > > On Mon, Oct 24, 2016 at 10:29:30PM +0100, Dominik Vogt wrote:
> > > > ... but in a separate commit please.  Patching the NEWS file in
> > > > the same commit as the code change makes bug hunting and reverting
> > > > patches more difficult.
> > > 
> > > Maybe, but how often does that really happen?
> > 
> > It actually happens all the time when you want to reshuffle or
> > revert commits with NEWS entries.  The was worse with the
> > ChangeLog.  In CVS you wouldn't notice this often becaus you
> > couldn't rebase anything, but in Git its quite annyoing to my
> > experience.
> 
> Hmm.  But then you'll also have to explicitly identify the other stuff in NEWS
> as well.  Ah, I dunno---maybe it's not such a problem, but I think trying to
> enforce this going to be hard.  It's not something I'll necessarily remember
> to follow.

I've made a habit of using "git add -i" to sort the pending
changes into series of small commits so I won't accidentally
changes that I don't want to (like debug printfs and accidental
formatting changes).  If I keep NEWS and ChangeLog changes and the
like in the commits that actually so the real work, I always get
conflicts when rebasing stuff, so keeping it separately comes with
lazyness.

Ciao

Dominik ^_^  ^_^

-- 

Dominik Vogt

Re: [fvwmorg/fvwm] 64d424: DEVELOPERS: mention NEWS file

2016-10-24 Thread Thomas Adam 
On Tue, Oct 25, 2016 at 12:23:54AM +0100, Dominik Vogt wrote:
> On Mon, Oct 24, 2016 at 11:54:00PM +0100, Thomas Adam wrote:
> > On Mon, Oct 24, 2016 at 10:29:30PM +0100, Dominik Vogt wrote:
> > > ... but in a separate commit please.  Patching the NEWS file in
> > > the same commit as the code change makes bug hunting and reverting
> > > patches more difficult.
> > 
> > Maybe, but how often does that really happen?
> 
> It actually happens all the time when you want to reshuffle or
> revert commits with NEWS entries.  The was worse with the
> ChangeLog.  In CVS you wouldn't notice this often becaus you
> couldn't rebase anything, but in Git its quite annyoing to my
> experience.

Hmm.  But then you'll also have to explicitly identify the other stuff in NEWS
as well.  Ah, I dunno---maybe it's not such a problem, but I think trying to
enforce this going to be hard.  It's not something I'll necessarily remember
to follow.

Kindly,
Thomas

Re: [fvwmorg/fvwm] 64d424: DEVELOPERS: mention NEWS file

2016-10-24 Thread Dominik Vogt 
On Mon, Oct 24, 2016 at 11:54:00PM +0100, Thomas Adam wrote:
> On Mon, Oct 24, 2016 at 10:29:30PM +0100, Dominik Vogt wrote:
> > ... but in a separate commit please.  Patching the NEWS file in
> > the same commit as the code change makes bug hunting and reverting
> > patches more difficult.
> 
> Maybe, but how often does that really happen?

It actually happens all the time when you want to reshuffle or
revert commits with NEWS entries.  The was worse with the
ChangeLog.  In CVS you wouldn't notice this often becaus you
couldn't rebase anything, but in Git its quite annyoing to my
experience.

> The problem with making NEWS
> file special somehow is going to cause problems with git-bisect because you'd
> be forever skipping over commits.

The worst that can happen is that you have twice as many commits,
i.e. one bisect step more that usual.  But actually NEWS commits
are quite rare.  Most of the changes don't make it into the NEWS
file.  So, yes, sometimes you'll have one more bisect step, but
that's maybe an extra three minutes or so.  I wouldn't worry about
that.

Ciao

Dominik ^_^  ^_^

-- 

Dominik Vogt

Re: [fvwmorg/fvwm] 64d424: DEVELOPERS: mention NEWS file

2016-10-24 Thread Thomas Adam 
On Mon, Oct 24, 2016 at 10:29:30PM +0100, Dominik Vogt wrote:
> On Sun, Oct 23, 2016 at 02:46:46AM +0100, Dominik Vogt wrote:
> > On Sat, Oct 22, 2016 at 06:32:12PM -0700, GitHub wrote:
> > >   Branch: refs/heads/ta/reluctant-news
> > >   Home:   https://github.com/fvwmorg/fvwm
> > >   Commit: 64d4244746754610a64ed35de9ca69e557d3e25a
> > >   
> > > https://github.com/fvwmorg/fvwm/commit/64d4244746754610a64ed35de9ca69e557d3e25a
> > >   Author: Thomas Adam 
> > >   Date:   2016-10-23 (Sun, 23 Oct 2016)
> > > 
> > >   Changed paths:
> > > M docs/DEVELOPERS.md
> > > 
> > >   Log Message:
> > >   ---
> > >   DEVELOPERS: mention NEWS file
> > 
> > Thanks.
> > 
> > > Let's try and get patches which introduce changes to also include changes 
> > > to
> > > the NEWS file.
> 
> ... but in a separate commit please.  Patching the NEWS file in
> the same commit as the code change makes bug hunting and reverting
> patches more difficult.

Maybe, but how often does that really happen?  The problem with making NEWS
file special somehow is going to cause problems with git-bisect because you'd
be forever skipping over commits.

-- Thomas Adam

Re: [fvwmorg/fvwm] 64d424: DEVELOPERS: mention NEWS file

2016-10-24 Thread Dominik Vogt 
On Sun, Oct 23, 2016 at 02:46:46AM +0100, Dominik Vogt wrote:
> On Sat, Oct 22, 2016 at 06:32:12PM -0700, GitHub wrote:
> >   Branch: refs/heads/ta/reluctant-news
> >   Home:   https://github.com/fvwmorg/fvwm
> >   Commit: 64d4244746754610a64ed35de9ca69e557d3e25a
> >   
> > https://github.com/fvwmorg/fvwm/commit/64d4244746754610a64ed35de9ca69e557d3e25a
> >   Author: Thomas Adam 
> >   Date:   2016-10-23 (Sun, 23 Oct 2016)
> > 
> >   Changed paths:
> > M docs/DEVELOPERS.md
> > 
> >   Log Message:
> >   ---
> >   DEVELOPERS: mention NEWS file
> 
> Thanks.
> 
> > Let's try and get patches which introduce changes to also include changes to
> > the NEWS file.

... but in a separate commit please.  Patching the NEWS file in
the same commit as the code change makes bug hunting and reverting
patches more difficult.

Ciao

Dominik ^_^  ^_^

-- 

Dominik Vogt

Re: [fvwmorg/fvwm] 64d424: DEVELOPERS: mention NEWS file

2016-10-22 Thread Dominik Vogt 
On Sat, Oct 22, 2016 at 06:32:12PM -0700, GitHub wrote:
>   Branch: refs/heads/ta/reluctant-news
>   Home:   https://github.com/fvwmorg/fvwm
>   Commit: 64d4244746754610a64ed35de9ca69e557d3e25a
>   
> https://github.com/fvwmorg/fvwm/commit/64d4244746754610a64ed35de9ca69e557d3e25a
>   Author: Thomas Adam 
>   Date:   2016-10-23 (Sun, 23 Oct 2016)
> 
>   Changed paths:
> M docs/DEVELOPERS.md
> 
>   Log Message:
>   ---
>   DEVELOPERS: mention NEWS file

Thanks.

> Let's try and get patches which introduce changes to also include changes to
> the NEWS file.

That's what I've always done (for user visible changes or internal
changes with a high risk of breaking things).

Ciao

Dominik ^_^  ^_^

-- 

Dominik Vogt

[fvwmorg/fvwm] 64d424: DEVELOPERS: mention NEWS file

2016-10-22 Thread GitHub 
  Branch: refs/heads/ta/reluctant-news
  Home:   https://github.com/fvwmorg/fvwm
  Commit: 64d4244746754610a64ed35de9ca69e557d3e25a
  
https://github.com/fvwmorg/fvwm/commit/64d4244746754610a64ed35de9ca69e557d3e25a
  Author: Thomas Adam 
  Date:   2016-10-23 (Sun, 23 Oct 2016)

  Changed paths:
M docs/DEVELOPERS.md

  Log Message:
  ---
  DEVELOPERS: mention NEWS file

Let's try and get patches which introduce changes to also include changes to
the NEWS file.