Re: Manual merges.

2011-10-26 Thread Miles Bader
> On my own "real" projects (the ones with real users), I view the version > control logs as messages for active developers and ChangeLog as messages > for users and occasional developers. So git sees small one-off messages > on a regular basis, and the ChangeLog is updated when big user-visible >

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
override my advice ;-) > > I think my suggestion is the only one without drawbacks for the general > case when manual merges are required. > Then go for it :-) Regards, Stefano

Re: Manual merges.

2011-10-21 Thread Peter Rosin
e ChangeLog file should be generated? > I'm not sure which of these three options (the one proposed by you > and the one proposed by me) would be preferable, and I must say I have > no real preference either. So you choose (unless Someone Else wants > to chime in and override my advice ;-) I think my suggestion is the only one without drawbacks for the general case when manual merges are required. Cheers, Peter

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'