[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

diff'ing a branch against HEAD doesn't work

From: Jean-Christian Imbeault
Subject: diff'ing a branch against HEAD doesn't work
Date: Thu, 14 Oct 2004 18:38:15 +0900
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.7.2) Gecko/20040804 Netscape/7.2 (ax)

I'm trying to diff a new file in one branch against the same
non-existent file in HEAD but I get nothing back. I was expecting for
diff to give the whole file back since it didn't exist in HEAD ...

$ cat > .test3
A file in the TEST branch but not in HEAD
$ cvs add .test3
cvs add: scheduling file `.test3' for addition on branch `TEST'
cvs add: use 'cvs commit' to add this file permanently
$ cvs commit -m "test3" .test3
***** Access ALLOWED !! *****
RCS file: /repos/MRW/foundation/Attic/.test3,v
Checking in .test3;
/repos/MRW/foundation/Attic/.test3,v  <--  .test3
new revision:; previous revision: 1.1
$ cvs diff -u -r HEAD .test3

I've even trying adding the file to HEAD and then doing a diff from the
TEST branch but gives no results either.

But strangely enough if I try and diff from HEAD then it works:

$ cvs status .test3
File: .test3            Status: Up-to-date

   Working revision:    1.2
   Repository revision: 1.2     /repos/MRW/foundation/.test3,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

$ cvs diff -u -r TEST .test3
Index: .test3
RCS file: /repos/MRW/foundation/.test3,v
retrieving revision
retrieving revision 1.2
diff -u -r1.1.2.1 -r1.2
--- .test3      14 Oct 2004 09:20:00 -0000
+++ .test3      14 Oct 2004 09:34:11 -0000      1.2
@@ -1 +1 @@
-A file in the TEST branch but not in HEAD
+A file in HEAD and on the TEST branch

What is the reason why I can diff from HEAD to another branch but not
from a branch to HEAD?


Jean-Christian Imbeault

Note: This e-mail contains privileged and confidential information and is for 
the sole use of the intended recipient(s).  If you are not an intended 
recipient, you are hereby kindly requested to refrain from printing, copying, 
or distributing the information contained herein.  Furthermore, any other use 
of the information contained herein is strictly prohibited.  If you have 
received this transmission in error, please kindly notify the sender 
immediately and destroy all copies of the original message.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]