Re: Manual merges.

2011-10-21 Thread dherring
On Fri, 21 Oct 2011, Bob Friesenhahn wrote: > On Fri, 21 Oct 2011, Stefano Lattarini wrote: >>> >>> Should I perhaps file a bug that the ChangeLog file should be >>> generated? >>> >> That would be a good idea in the long(ish) term. In fact, I pesonally >> see >> ChangeLogs as a relic of the pre-V

Re: Manual merges.

2011-10-21 Thread Stefano Lattarini
On Friday 21 October 2011, Bob Friesenhahn wrote: > On Fri, 21 Oct 2011, Stefano Lattarini wrote: > >> > >> Should I perhaps file a bug that the ChangeLog file should be generated? > >> > > That would be a good idea in the long(ish) term. In fact, I pesonally see > > ChangeLogs as a relic of the p

Re: Manual merges.

2011-10-21 Thread Bob Friesenhahn
On Fri, 21 Oct 2011, Stefano Lattarini wrote: Should I perhaps file a bug that the ChangeLog file should be generated? That would be a good idea in the long(ish) term. In fact, I pesonally see ChangeLogs as a relic of the pre-VCS era; they were surely VERY useful to track regressions and bugs

Re: Manual merges.

2011-10-21 Thread Stefano Lattarini
On Friday 21 October 2011, Peter Rosin wrote: > Hi Stefano, > > [SNIP various good objections] > > Should I perhaps file a bug that the ChangeLog file should be generated? > That would be a good idea in the long(ish) term. In fact, I pesonally see ChangeLogs as a relic of the pre-VCS era; they wer

Re: Manual merges.

2011-10-21 Thread Peter Rosin
Hi Stefano, Stefano Lattarini skrev 2011-10-21 10:17: > On Friday 21 October 2011, Peter Rosin wrote: >> Hi! >> > Hi Peter. > >> I checked to see what would happen if I merged maint back into msvc after >> commiting the AM_PROG_AR series, and there is some minor testsuite fallout >> that needs to

Re: Manual merges.

2011-10-21 Thread Stefano Lattarini
On Friday 21 October 2011, Peter Rosin wrote: > Hi! > Hi Peter. > I checked to see what would happen if I merged maint back into msvc after > commiting the AM_PROG_AR series, and there is some minor testsuite fallout > that needs to be fixed manually. My plan was to amend the merge commit > with

Manual merges.

2011-10-21 Thread Peter Rosin
Hi! I checked to see what would happen if I merged maint back into msvc after commiting the AM_PROG_AR series, and there is some minor testsuite fallout that needs to be fixed manually. My plan was to amend the merge commit with the fixups, along with a note in ChangeLog pointing to what files I'