[issue275] hg qpush has problems creating files
Chris Mason
mason at suse.com
Wed May 31 11:51:22 CDT 2006
On Tuesday 30 May 2006 20:21, Jeremy Fitzhardinge wrote:
> New submission from Jeremy Fitzhardinge <jeremy at goop.org>:
>
> When using qpush to add 2.6.17-rc1-mm1 to a kernel tree, it complained
> about a conflict in .mm. The corresponding chunk is:
> --- /dev/null 2006-05-30 00:29:27.280999750 -0700
> +++ devel/.mm 2006-05-30 01:12:33.000000000 -0700
> @@ -0,0 +1 @@
> +1
>
> which should just create the file.
The patch program is the one adding the file...which hg rev is this? Does the
file get created (was it already there?)
-chris
More information about the Mercurial
mailing list