[Bug 5055] New: hg commit that waits on a lock help by hg commit --amend results in an unrelated changeset

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Thu Jan 21 09:12:53 UTC 2016


https://bz.mercurial-scm.org/show_bug.cgi?id=5055

            Bug ID: 5055
           Summary: hg commit that waits on a lock help by hg commit
                    --amend results in an unrelated changeset
           Product: Mercurial
           Version: 3.6.2
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: dee at earlsoft.co.uk
                CC: mercurial-devel at selenic.com

I did a commit --amend and forgot to close the message editor.
The next day, I went to do a normal commit which correctly waited on the lock.
After identifying the lock and closing the message editor, the amend completed
without issue.
When released, the normal commit carried on, resulting in an unrelated commit
with the selected files being added due to:

warning: ignoring unknown working parent .....

Here's a log of the commit from TortoiseHg:

% hg commit --verbose "--message=Moved the admin login ID variables to
$_SESSION (bug #2332)" --user "Deanna Earley <dee.earley at icode.co.uk>" --
admin/emailbulkprices.php admin/logoff.php admin/bulkprices.php
admin/includes/classes/goods.php admin/includes/header.php admin/login.php
admin/includes/functions/general.php admin/includes/classes/stock.php
admin/admin_account.php admin/goods.php
committing files:
admin/admin_account.php
admin/bulkprices.php
admin/emailbulkprices.php
admin/goods.php
admin/includes/classes/goods.php
admin/includes/classes/stock.php
admin/includes/functions/general.php
admin/includes/header.php
admin/login.php
admin/logoff.php
committing manifest
committing changelog
calling hook commit.lfiles: hgext.largefiles.reposetup.checkrequireslfiles
committed changeset 131:ee16b75248fd
[command completed successfully Wed Jan 20 17:06:40 2016]
% hg commit --verbose "--message=Moved the admin selected box variables to
$_SESSION (bug #2332)" --user "Deanna Earley <dee.earley at icode.co.uk>" --
admin/includes/boxes/gv_admin.php admin/includes/boxes/localization.php
admin/includes/boxes/freedelivery.php admin/includes/functions/general.php
admin/includes/boxes/customers.php admin/includes/boxes/taxes.php
admin/freedelivery.php admin/livesystems.php admin/includes/boxes/reports.php
admin/admin_account.php admin/includes/boxes/goods.php
admin/includes/boxes/modules.php admin/goods.php
admin/includes/boxes/returns.php admin/includes/boxes/icatcher.php
admin/includes/classes/goods.php admin/includes/boxes/configuration.php
admin/logoff.php admin/includes/boxes/tools.php
admin/includes/application_top.php admin/includes/boxes/articles.php
admin/includes/boxes/affiliate.php admin/login.php admin/enhattr.php
admin/includes/boxes/administrator.php admin/includes/boxes/catalog.php
admin/includes/boxes/info_boxes.php
waiting for lock on working directory of W:\webdev\cctvshop\live held by
'Escher:10696'
got lock after 129 seconds
warning: ignoring unknown working parent 14f90857edc4!
committing files:
admin/enhattr.php
admin/freedelivery.php
admin/goods.php
admin/includes/application_top.php
admin/includes/boxes/administrator.php
admin/includes/boxes/affiliate.php
admin/includes/boxes/articles.php
admin/includes/boxes/catalog.php
admin/includes/boxes/configuration.php
admin/includes/boxes/customers.php
admin/includes/boxes/freedelivery.php
admin/includes/boxes/goods.php
admin/includes/boxes/gv_admin.php
admin/includes/boxes/icatcher.php
admin/includes/boxes/info_boxes.php
admin/includes/boxes/localization.php
admin/includes/boxes/modules.php
admin/includes/boxes/reports.php
admin/includes/boxes/returns.php
admin/includes/boxes/taxes.php
admin/includes/boxes/tools.php
admin/includes/classes/goods.php
admin/livesystems.php
committing manifest
committing changelog
calling hook commit.lfiles: hgext.largefiles.reposetup.checkrequireslfiles
created new head
committed changeset 132:8081c26404fc
[command completed successfully Thu Jan 21 08:52:04 2016]
Shop% 

Shouldn't this warning be a failure?
Also, something was done outside the lock, whether commit get the parent ID, or
commit --amend removed the old changeset I don't know.

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list