Status: Accepted
Owner: ----
CC: [email protected], [email protected]
Labels: Type-Bug Priority-Medium
New issue 3602 by [email protected]: When merge_to_branch.py fails (e.g.,
because of EDITOR not set), it won't delete the sentinel file
https://code.google.com/p/v8/issues/detail?id=3602
... and the next run fails with "A merge is already in progress".
Example log:
$ tools/push-to-trunk/merge_to_branch.py --branch 3.29 24251
Step 0: Preparation.
Command: which pico -w
in <redacted>
Error: Please set your EDITOR environment variable, you'll need it.
Exiting
Traceback (most recent call last):
File "tools/push-to-trunk/merge_to_branch.py", line 305, in <module>
sys.exit(MergeToBranch().Run())
File "/media/ssdvol/v8-bleeding2/tools/push-to-trunk/common_includes.py",
line 845, in Run
return self.RunSteps(self._Steps(), args)
File "/media/ssdvol/v8-bleeding2/tools/push-to-trunk/common_includes.py",
line 840, in RunSteps
if step.Run():
File "/media/ssdvol/v8-bleeding2/tools/push-to-trunk/common_includes.py",
line 429, in Run
return self.RunStep()
File "tools/push-to-trunk/merge_to_branch.py", line 46, in RunStep
self.InitialEnvironmentChecks(self.default_cwd)
File "/media/ssdvol/v8-bleeding2/tools/push-to-trunk/common_includes.py",
line 547, in InitialEnvironmentChecks
self.Die("Please set your EDITOR environment variable, you'll need it.")
File "/media/ssdvol/v8-bleeding2/tools/push-to-trunk/common_includes.py",
line 515, in Die
raise Exception(msg)
Exception: Please set your EDITOR environment variable, you'll need it.
$ export EDITOR=pico
$ tools/push-to-trunk/merge_to_branch.py --branch 3.29 24251
Step 0: Preparation.
Error: A merge is already in progress
Exiting
Traceback (most recent call last):
File "tools/push-to-trunk/merge_to_branch.py", line 305, in <module>
sys.exit(MergeToBranch().Run())
File "/media/ssdvol/v8-bleeding2/tools/push-to-trunk/common_includes.py",
line 845, in Run
return self.RunSteps(self._Steps(), args)
File "/media/ssdvol/v8-bleeding2/tools/push-to-trunk/common_includes.py",
line 840, in RunSteps
if step.Run():
File "/media/ssdvol/v8-bleeding2/tools/push-to-trunk/common_includes.py",
line 429, in Run
return self.RunStep()
File "tools/push-to-trunk/merge_to_branch.py", line 43, in RunStep
self.Die("A merge is already in progress")
File "/media/ssdvol/v8-bleeding2/tools/push-to-trunk/common_includes.py",
line 515, in Die
raise Exception(msg)
Exception: A merge is already in progress
--
You received this message because this project is configured to send all
issue notifications to this address.
You may adjust your notification preferences at:
https://code.google.com/hosting/settings
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
