[issue399] hg qpush can forget about new files

John Levon mercurial-bugs at selenic.com
Tue Oct 17 07:28:03 CDT 2006


New submission from John Levon <levon at movementarian.org>:

If a patch creates new files, and fails to apply, hg qpush doesn't hg add the
new files when it fails to apply elsewhere, meaning the new files are lost unless
the user remembers to hg add them by hand:

#!/bin/sh -x

rm -rf foo
mkdir foo
cd foo
hg init
hg qinit -c
hg qnew 1
echo "hello" >1
hg add 1
hg qrefresh
hg qnew 2
echo "hullo" >1
echo "la" >la
hg add la
hg qrefresh
hg qpop 1
echo "hallo" >1
hg qrefresh
hg qpush
hg status

applying 2
1
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file 1.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
Errors during apply, please fix and refresh 2
+ hg status
? 1.rej
? 1~
? la <---  new file forgotten

----------
messages: 2248
nosy: movement, tonfa
priority: bug
status: unread
title: hg qpush can forget about new files

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



More information about the Mercurial-devel mailing list