812606 - tagging rebase step shouldn't try to fire vim to resolve conflicts

Status: RESOLVED FIXED

(Release Engineering :: Release Automation: Other, defect)

Description

[Rail Aliiev [:rail]]

Attachment: use internal merge

During Thunderbird 17 release build we hit a race condition (see the log snippet below). hg rabase tried to use vim to resolve conflicts, what shouldn't happen.

command: START
command: hg push -e "ssh -l tbirdbld -i ~cltbld/.ssh/tbirdbld_dsa" --new-branch ssh://hg.mozilla.org/releases/l10n/mozilla-release/es-AR
command: cwd: es-AR
command: output:
pushing to ssh://hg.mozilla.org/releases/l10n/mozilla-release/es-AR
searching for changes
abort: push creates new remote heads on branch 'GECKO170_2012111611_RELBRANCH'!
(you should pull and merge or use push -f to force)
remote: Not trusting file /repo/hg/mozilla/releases/l10n/mozilla-release/es-AR/.hg/hgrc from untrusted user root, group scm_l10n
remote: Not trusting file /repo/hg/mozilla/releases/l10n/mozilla-release/es-AR/.hg/hgrc from untrusted user root, group scm_l10n
command: ERROR
Traceback (most recent call last):
  File "/builds/slave/rel-c-rel-thunderbird-tag/scripts/scripts/release/../../lib/python/util/commands.py", line 40, in run_cmd
    return subprocess.check_call(cmd, **kwargs)
  File "/tools/python-2.5.1/lib/python2.5/subprocess.py", line 461, in check_call
    raise CalledProcessError(retcode, cmd)
CalledProcessError: Command '['hg', 'push', '-e', 'ssh -l tbirdbld -i ~cltbld/.ssh/tbirdbld_dsa', '--new-branch', 'ssh://hg.mozilla.org/releases/l10n/mozilla-release/es-AR']' returned non-zero exit status 1
command: END (0.89s elapsed)

command: START
command: hg pull -e "ssh -l tbirdbld -i ~cltbld/.ssh/tbirdbld_dsa" ssh://hg.mozilla.org/releases/l10n/mozilla-release/es-AR
command: cwd: es-AR
command: output:
pulling from ssh://hg.mozilla.org/releases/l10n/mozilla-release/es-AR
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
remote: Not trusting file /repo/hg/mozilla/releases/l10n/mozilla-release/es-AR/.hg/hgrc from untrusted user root, group scm_l10n
remote: Not trusting file /repo/hg/mozilla/releases/l10n/mozilla-release/es-AR/.hg/hgrc from untrusted user root, group scm_l10n
command: END (0.91s elapsed)

command: START
command: hg rebase
command: cwd: es-AR
command: output:
conflicts detected in /builds/slave/rel-c-rel-thunderbird-tag/es-AR/.hgtags
Vim: Warning: Output is not to a terminal
Vim: Warning: Input is not from a terminal
[1;24r[?25h[?8c[?25h[?0c[27m[24m[0m[H[J[?25l[?1c[24;1H"/builds/slave/rel-c-rel-thunderbird-tag/es-AR/.hgtags" 
"/builds/slave/rel-c-rel-thunderbird-tag/es-AR/.hgtags" 12L, 688C[1;1He35e14d53ef0ac938581329e8feb02135120bc50 THUNDERBIRD_3_0a3_RELEASE
e35e14d53ef0ac938581329e8feb02135120bc50 THUNDERBIRD_3_0a3_BUILD2
a4c5827fb90171f4f58557620c41e39d6727d055 THUNDERBIRD_3_0b1_RELEASE
a4c5827fb90171f4f58557620c41e39d6727d055 THUNDERBIRD_3_0b1_BUILD1
511038de6d510a72981911786f96ff4cc9ea04b5 GECKO_1_9_2_BASE
<<<<<<< /builds/slave/rel-c-rel-thunderbird-tag/es-AR/.hgtags
fa05fe8c36fdd569298251a3212c612cdcc49c36 FIREFOX_17_0esr_RELEASE
fa05fe8c36fdd569298251a3212c612cdcc49c36 FIREFOX_17_0esr_BUILD1
=======
b71b532001bc0a1d9600aceeec99472aad04190e THUNDERBIRD_17_0_RELEASE
b71b532001bc0a1d9600aceeec99472aad04190e THUNDERBIRD_17_0_BUILD1
>>>>>>> /tmp/.hgtags~other.vWhibb
[1m[34m~                                                                               [14;1H~                                                                               [15;1H~                                                                               [16;1H~                                                                               [17;1H~                                                                               [18;1H~                                                                               [19;1H~                                                                               [20;1H~                                                                               [21;1H~                                                                               [22;1H~                                                                               [23;1H~                                                                               [1;1H[?25h[?0c
command timed out: 1200 seconds without output, attempting to kill
process killed by signal 9
program finished with exit code -1
elapsedTime=1562.542667

Comment 1

[Rail Aliiev [:rail]]

Comment on attachment 682590 [details] [diff] [review]
use internal merge

http://hg.mozilla.org/build/tools/rev/20af4a3f34f6