[issue390] git diffs leave empty diffs in MQ patches

John Levon mercurial-bugs at selenic.com
Tue Oct 10 20:55:17 UTC 2006


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

If I modify a file in a patch, qrefresh, then undo the modification, then
the file is still listed as an empty diff in the patch:

xenbld:xen.hg $ hg qnew foo
xenbld:xen.hg $ echo a >>Makefile
xenbld:xen.hg $ hg diff
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -218,3 +218,4 @@ uninstall:
 .PHONY: linux26
 linux26:
        $(MAKE) 'KERNELS=linux-2.6*' kernels
+a
xenbld:xen.hg $ hg qrefresh
xenbld.xen.hg $ vi Makefile # remove that line again
xenbld:xen.hg $ hg qdiff
xenbld:xen.hg $ hg diff
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -218,4 +218,3 @@ uninstall:
 .PHONY: linux26
 linux26:
        $(MAKE) 'KERNELS=linux-2.6*' kernels
-a
xenbld:xen.hg $ hg qrefresh
xenbld:xen.hg $ cat .hg/patches/foo
diff --git a/Makefile b/Makefile
xenbld:xen.hg $ hg qdiff Makefile
diff --git a/Makefile b/Makefile
xenbld:xen.hg $

----------
messages: 2151
nosy: movement
priority: bug
status: unread
title: git diffs leave empty diffs in MQ patches

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




More information about the Mercurial-devel mailing list