Actually, it is the opposite. Bailout works fine, it is when I ":wq"
in Vi for example, that it fails to submit and reverts all my changes.
if os.stat(template_file).st_mtime <= mtime:
while True:
response = raw_input("Submit template unchanged.
Submit anyway? [y]es, [n]o (skip this patch) ")
if response == 'y':
return True
if response == 'n':
return False
# I think this else needs to be added here, so when the file
has been modified since it was opened in the editor, it will properly
submit the change.
else:
return True
Mike
On Fri, Dec 16, 2011 at 2:50 PM, Luke Diamand <luke@xxxxxxxxxxx> wrote:
>
> On 16/12/11 15:38, Michael Horowitz wrote:
>>
>> All,
>>
>> It appears that this change has introduced a bug that causes submit to
>> fail every time if you do not skip the submit edit.
>>
>> From what I can tell, this is because the new edit_template method
>> does not return True at the end.
>
>
> Could you say exactly what you're doing?
>
> I've just tried it myself and it seems to work fine:
>
> git-p4 clone
> git commit -m 'a change'
> git-p4 submit
> <quit from editor, with/without modifying it>
>
> And I couldn't see any paths in edit_template that returned without a value of True, except the one where the user decides to bail out.
>
> This is with Pete's skipSubmitEdit change.
>
> Thanks!
> Luke
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html