On 04/11/2013 11:40 AM, Joshua Cranmer 🐧 wrote:
On 4/11/2013 1:33 PM, ISHIKAWA,chiaki wrote:
(2013/04/11 23:43), Joshua Cranmer 🐧 wrote:
On 4/11/2013 2:43 AM, ishikawa wrote:
Has anyone seen the problem of the patches to M-C portion of the
COMM-CENTRAL not accepted by Thunderbird TryServer because the patches
fail although linux32 and linux64 work as expected?
The bug is that the Windows try server is attempting to apply the
patches twice, which, obviously, fails. The solution I
added (kudos to Mark Banner for originally coming up with it) was to
add these lines to my push-to-try script:
sed -i -e 's/--hgtool=[^ ]*/--apply-patches/'
$ccrepo/build/client.py-args
sed -i -e '/ALWAYS_RUN_CLIENT_PY/d'
$ccrepo/mail/config/mozconfigs/win32/*
[ccrepo is a shell variable that refers to the root of the
comm-central repository]
THANK YOU. I will try.
I need a small clarfication. The above sed commands need to be
invoked on the try server.
Exactly what file is "push-to-try script"?
I locally wrote a shell script that I call "push-to-try" that
automatically does everything I need to do when pushing to try. One of
its features is automatically converting applied patches in the
mozilla-central repository to the applied patches. In effect, the
actual change you would need to do is delete "ALWAYS_RUN_CLIENT_PY=1"
from the mail/config/mozconfigs/win32/ files.
(I also have one of these scripts at
http://k0s.org/mozilla/hg/MozillaTry ; be careful, it will mess with
your repo! I imagine there are probably dozens of other one-offs to this
end.)
_______________________________________________
dev-platform mailing list
dev-platform@lists.mozilla.org
https://lists.mozilla.org/listinfo/dev-platform
