[issue2392] confusing error message when qpush fails

David bugs at mercurial.selenic.com
Wed Sep 22 12:13:51 CDT 2010


New submission from David <ddahl at mozilla.com>:

a description copied from an irc conversation:

<ddahl> anarchy ~/code/moz/mozilla-central/mozilla-central % hg qpush
<ddahl> applying integrate-lazy-console
<ddahl> patch failed, unable to continue (try -v)
<ddahl> patch failed, rejects left in working dir
<ddahl> errors during apply, please fix and refresh integrate-lazy-console
<ddahl> anarchy 2~/code/moz/mozilla-central/mozilla-central % hg qpop 
<ddahl> popping integrate-lazy-console
<ddahl> now at: xpcom-console.diff

<ddahl> "unable to continue" does not say to me that the patch is not
applied at all

<ddahl> and
<ddahl> the rejects are not there
<ddahl> so it appears that the patch is applied, as you do have to qpop to
revert, but there was nothing applied

very confusing. when applying via patch, the error is:

anarchy 2~/code/moz/mozilla-central/mozilla-central % patch --verbose <
~/Desktop/patches/integrate-patches/hud.js.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/toolkit/components/console/hudservice/HUDService.jsm
b/toolkit/components/console/hudservice/HUDService.jsm
|--- a/toolkit/components/console/hudservice/HUDService.jsm
|+++ b/toolkit/components/console/hudservice/HUDService.jsm
--------------------------
Patching file HUDService.jsm using Plan A...
Hunk #1 FAILED at 80.
Hunk #2 FAILED at 1193.
Hunk #3 FAILED at 1641.
Hunk #4 FAILED at 1706.
patch: **** malformed patch at line 146: @@ -2788,16 +2820,18 @@ function
HeadsUpDisplay(aConfig)

This is with hg 1.6.3 on ubuntu, my .hgrc looks like:

[ui]
merge = kdiff3
username = David Dahl <ddahl at mozilla.com>

[diff]
git = 1
showfunc = True
unified = 8
ignorews = True
ignoreblanklines = True

[defaults]
diff=-p -U 8
commit= -v 

[paths]

[extensions]
hgext.mq =
fetch =
hgext.rebase = 
extdiff =

[merge-tools]  
# Specify command line
kdiff3.args = $base $local $other -o $output
# Give higher priority
kdiff3.priority = 1

----------
messages: 13685
nosy: ddahl
priority: bug
status: unread
title: confusing error message when qpush fails

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2392>
____________________________________________________


More information about the Mercurial-devel mailing list