diff missing some files

Darrell Gallion dgallion1 at gmail.com
Thu Dec 7 17:06:23 UTC 2006


This was tricky to reproduce.
Create a repo with two directories, with one file each. Then I started
changing them, followed by adding a new file to one directory.

Then I get a diff like this, which when viewed with extdiff tool, indicates
the d1 directory was deleted in version 3
It wasn't.

C:\work\ttt\test>hg.py diff -r4:3
diff -r b517c8ac23b7 -r bdd63ddd74d1 d1/f3
--- a/d1/f3     Thu Dec 07 11:47:18 2006 -0500
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@


=======================================
8 minutes ago:      xx
changeset 4:     b517c8ac23b7
tag:    tip
author:     darrell
date:     Thu Dec 07 11:47:18 2006 -0500
files:     d1/f3

9 minutes ago:     xx
changeset 3:     bdd63ddd74d1
author:     darrell
date:     Thu Dec 07 11:46:29 2006 -0500
files:     d2/f2

9 minutes ago:     xx
changeset 2:     d52ba35c4165
author:     darrell
date:     Thu Dec 07 11:46:07 2006 -0500
files:     d1/f1

62 minutes ago:     xx
changeset 1:     e2b5c9e29a91
author:     darrell
date:     Thu Dec 07 10:53:37 2006 -0500
files:     d2/f2

62 minutes ago:     xx
changeset 0:     88817b30ba39
author:     darrell
date:     Thu Dec 07 10:53:16 2006 -0500
files:     d1/f1
#===================================================
C:\work\ttt\test>hg.py diff -r1:0
diff -r e2b5c9e29a91 -r 88817b30ba39 d2/f2
--- a/d2/f2     Thu Dec 07 10:53:37 2006 -0500
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-

C:\work\ttt\test>hg.py diff -r2:1
diff -r d52ba35c4165 -r e2b5c9e29a91 d1/f1
--- a/d1/f1     Thu Dec 07 11:46:07 2006 -0500
+++ b/d1/f1     Thu Dec 07 10:53:37 2006 -0500
@@ -1,2 +1,1 @@

-1


C:\work\ttt\test>hg.py diff -r3:2
diff -r bdd63ddd74d1 -r d52ba35c4165 d2/f2
--- a/d2/f2     Thu Dec 07 11:46:29 2006 -0500
+++ b/d2/f2     Thu Dec 07 11:46:07 2006 -0500
@@ -1,2 +1,1 @@

-2


C:\work\ttt\test>hg.py diff -r4:3
diff -r b517c8ac23b7 -r bdd63ddd74d1 d1/f3
--- a/d1/f3     Thu Dec 07 11:47:18 2006 -0500
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20061207/fef33cfe/attachment-0002.html>


More information about the Mercurial mailing list