Re: Auto-merging translations and master

2012-06-11 Thread John Mandereau
Il giorno mar, 05/06/2012 alle 10.42 -0300, Han-Wen Nienhuys ha scritto: > it would be best if "make dist" were rewritten to take git's idea of > the tree, and then add any necessary generated files (eg. configure, > README) to that. If we go this route, we should have a fallback for making dist o

Re: Auto-merging translations and master

2012-06-05 Thread Han-Wen Nienhuys
On Tue, Jun 5, 2012 at 5:11 AM, John Mandereau wrote: > What do you think of this? > > The only objection I'm seeing for now is that there are too frequent > issues of files non distributed in tarball; for dealing with this I > propose to use dist-check from GUB, with an option to try using it >

Re: Auto-merging translations and master

2012-06-05 Thread David Kastrup
Graham Percival writes: > On Tue, Jun 05, 2012 at 10:11:46AM +0200, John Mandereau wrote: >> Now that I have looked at the scripts for building staging and merging >> it into master, upgraded my Fedora installation, a cron job runs this >> every two hours on my computer in the lab, and sends an e

Re: Auto-merging translations and master

2012-06-05 Thread Graham Percival
On Tue, Jun 05, 2012 at 10:11:46AM +0200, John Mandereau wrote: > Now that I have looked at the scripts for building staging and merging > it into master, upgraded my Fedora installation, a cron job runs this > every two hours on my computer in the lab, and sends an email > notification only if som

Re: Auto-merging translations and master

2012-06-05 Thread David Kastrup
John Mandereau writes: > Il giorno mar, 05/06/2012 alle 12.15 +0200, David Kastrup ha scritto: >> Change A redefines a function and its callers. >> >> Change B introduces another call of the function. >> >> No merge conflict. > > I see. You're right, in an ideal world change B would always pro

Re: Auto-merging translations and master

2012-06-05 Thread John Mandereau
Il giorno mar, 05/06/2012 alle 12.15 +0200, David Kastrup ha scritto: > Change A redefines a function and its callers. > > Change B introduces another call of the function. > > No merge conflict. I see. You're right, in an ideal world change B would always produce a build error, but in the real

Re: Auto-merging translations and master

2012-06-05 Thread David Kastrup
John Mandereau writes: > Il giorno mar, 05/06/2012 alle 11.16 +0200, David Kastrup ha scritto: >> The only automatic merges that are actually safe to do are >> fast-forwards, and the translation merges are not of that kind. > > Aren't merges that don't produce conflicts safe to handle with a > no

Re: Auto-merging translations and master

2012-06-05 Thread John Mandereau
Il giorno mar, 05/06/2012 alle 11.16 +0200, David Kastrup ha scritto: > The only automatic merges that are actually safe to do are > fast-forwards, and the translation merges are not of that kind. Aren't merges that don't produce conflicts safe to handle with a non-interactive cron job? Such a jo

Re: Auto-merging translations and master

2012-06-05 Thread David Kastrup
Francisco Vila writes: > 2012/6/5 David Kastrup : >> The only automatic merges that are actually safe to do are >> fast-forwards, and the translation merges are not of that kind. > > Sure? we change our own distinct files. commit 30339cb3706f6399c84607426988b25f79b4998c Merge: 9578677 9564d28 A

Re: Auto-merging translations and master

2012-06-05 Thread Francisco Vila
2012/6/5 David Kastrup : > The only automatic merges that are actually safe to do are > fast-forwards, and the translation merges are not of that kind. Sure? we change our own distinct files. -- Francisco Vila. Badajoz (Spain) www.paconet.org , www.csmbadajoz.com ___

Re: Auto-merging translations and master

2012-06-05 Thread David Kastrup
John Mandereau writes: > Hello, > > Now that I have looked at the scripts for building staging and merging > it into master, upgraded my Fedora installation, a cron job runs this > every two hours on my computer in the lab, and sends an email > notification only if something fails or when a build

Re: [translations] Auto-merging translations and master

2012-06-05 Thread John Mandereau
Il giorno mar, 05/06/2012 alle 11.07 +0200, Francisco Vila ha scritto: > It would be a time-saver for me. But imagine that translations has a > compile stopper and I am not reacheable for 48 hours. Would it mean 24 > alert messages? It should mean an alert message every time a new commit is pushed

Re: [translations] Auto-merging translations and master

2012-06-05 Thread Francisco Vila
2012/6/5 John Mandereau : > Hello, > > Now that I have looked at the scripts for building staging and merging > it into master, upgraded my Fedora installation, a cron job runs this > every two hours on my computer in the lab, and sends an email > notification only if something fails or when a buil

Auto-merging translations and master

2012-06-05 Thread John Mandereau
Hello, Now that I have looked at the scripts for building staging and merging it into master, upgraded my Fedora installation, a cron job runs this every two hours on my computer in the lab, and sends an email notification only if something fails or when a build is done. How about adding merging