[issue2035] subrepos: Failed subrepo push does not abort main repo push

Devin Chalmers bugs at mercurial.selenic.com
Thu Feb 11 23:29:46 UTC 2010


New submission from Devin Chalmers <devin.chalmers at gmail.com>:

Coworkers and I have run into issue #1771 a few times, and I know for a fact 
that it's been caused by this issue.

Though Mercurial (v1.4.2) pushes subrepos before the main repo, if a subrepo 
push fails (e.g. because of a failure to merge) the main repository push 
will continue without issue, leaving hgsubstate in an inconsistent and 
unsatisfiable state. Then pullers from the main repo will run into the 
"unknown revision" subrepo bug, which really is kind of a bear to recover 
from unless you're a mercurial wizard.

It can happen like this:

$ hg push
pushing to <url>
pushing subrepo <foo>
searching for changes
abort: push creates new remote heads!              <-------- things break
(did you forget to merge? use push -f to force)    <-------- up here
pushing subrepo <bar>
searching for changes
no changes found
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
bb/acl: qwzybug is allowed. accepted payload.
quota: 672.3 MB in use, 26.0 GB available (2.53% used)

(attached pictogram form as well)

It seems logical that a failed push of a subrepo would abort the whole push, 
and avoid a whole lot of unknown revision errors.

----------
files: 20100211-tmc7kca2a8338rsh2au3kuecsu.png
messages: 11673
nosy: qwzybug
priority: bug
status: unread
title: subrepos: Failed subrepo push does not abort main repo push

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2035>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20100211-tmc7kca2a8338rsh2au3kuecsu.png
Type: image/png
Size: 61728 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100211/429a1c0a/attachment.png>


More information about the Mercurial-devel mailing list