Re: [Wikitech-l] Git/gerrit and RELEASE-NOTES-1.20 merge conflicts

2012-04-08 Thread Harry Burt
On 05/04/12 10:53, Daniel Friesen wrote: I thought this might be problematic to have everyone install. But thinking about it again. Gerrit is the one doing merges. If that can handle the RELEASE-NOTES format that we uses. Then theoretically installing it on the server gerrit uses and then

Re: [Wikitech-l] Git/gerrit and RELEASE-NOTES-1.20 merge conflicts

2012-04-05 Thread Daniel Friesen
On Tue, 03 Apr 2012 18:24:03 -0700, Tim Starling tstarl...@wikimedia.org wrote: On 04/04/12 10:31, Daniel Friesen wrote: We have a policy of restricting the length of the first line. Since it's used by gerrit as email subjects. So as a result when I write the first line of a git commit I

Re: [Wikitech-l] Git/gerrit and RELEASE-NOTES-1.20 merge conflicts

2012-04-05 Thread Platonides
On 05/04/12 10:53, Daniel Friesen wrote: Firstly: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c A git merge that seams to understand how to intelligently merge some types of changelog files. I thought this might be problematic to have everyone install.

[Wikitech-l] Git/gerrit and RELEASE-NOTES-1.20 merge conflicts

2012-04-03 Thread Brion Vibber
One thing I've noticed in the last couple of days of madly reviewing things in gerrit is that merge conflicts in the RELEASE-NOTES-1.20 file are very common. Because of the delay between submission and post-review merge, there's a high probability that a new entry in one of the sections of

Re: [Wikitech-l] Git/gerrit and RELEASE-NOTES-1.20 merge conflicts

2012-04-03 Thread Amir E. Aharoni
2012/4/3 Brion Vibber br...@wikimedia.org: Do we really need to be maintaining these release notes files this way, though? Now that we have pre-commit review, we can more aggressively police commit messages so that the first line is more consistently release-notes-ready, and we can generate

Re: [Wikitech-l] Git/gerrit and RELEASE-NOTES-1.20 merge conflicts

2012-04-03 Thread Chad
On Tue, Apr 3, 2012 at 4:29 PM, Brion Vibber br...@wikimedia.org wrote: One thing I've noticed in the last couple of days of madly reviewing things in gerrit is that merge conflicts in the RELEASE-NOTES-1.20 file are very common. Because of the delay between submission and post-review merge,

Re: [Wikitech-l] Git/gerrit and RELEASE-NOTES-1.20 merge conflicts

2012-04-03 Thread Krenair
Why not just maintain them on MediaWiki.org? When you merge changes, simply add to the Release notes/1.20 page. It might even be possible to automate that. On 03/04/12 21:29, Brion Vibber wrote: One thing I've noticed in the last couple of days of madly reviewing things in gerrit is that

Re: [Wikitech-l] Git/gerrit and RELEASE-NOTES-1.20 merge conflicts

2012-04-03 Thread Daniel Friesen
On Tue, 03 Apr 2012 13:29:44 -0700, Brion Vibber br...@wikimedia.org wrote: One thing I've noticed in the last couple of days of madly reviewing things in gerrit is that merge conflicts in the RELEASE-NOTES-1.20 file are very common. Because of the delay between submission and post-review

Re: [Wikitech-l] Git/gerrit and RELEASE-NOTES-1.20 merge conflicts

2012-04-03 Thread Tim Starling
On 04/04/12 10:31, Daniel Friesen wrote: We have a policy of restricting the length of the first line. Since it's used by gerrit as email subjects. So as a result when I write the first line of a git commit I inevitably leave out critical information. So the first line of a commit misses out

Re: [Wikitech-l] Git/gerrit and RELEASE-NOTES-1.20 merge conflicts

2012-04-03 Thread Chad
On Tue, Apr 3, 2012 at 9:24 PM, Tim Starling tstarl...@wikimedia.org wrote: On 04/04/12 10:31, Daniel Friesen wrote: We have a policy of restricting the length of the first line. Since it's used by gerrit as email subjects. So as a result when I write the first line of a git commit I