[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: diff'ing a branch against HEAD doesn't work
From: |
Jean-Christian Imbeault |
Subject: |
Re: diff'ing a branch against HEAD doesn't work |
Date: |
Fri, 15 Oct 2004 11:19:24 +0900 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.7.2) Gecko/20040804 Netscape/7.2 (ax) |
Spiro Trikaliotis wrote:
> Try cvs diff -u -N -r HEAD .test3
Thanks for trying but that didn't help. Even if the file is not new I
still can't get diff to when I try to diff a branch to HEAD, but I can
diff HEAD to a branch.
== When in HEAD, diff works ==
$ cvs diff -r TEST .test3
Index: .test3
===================================================================
RCS file: /repos/MRW/foundation/.test3,v
retrieving revision 1.1.2.1
retrieving revision 1.2
diff -r1.1.2.1 -r1.2
1c1
< A file in the TEST branch but not in HEAD
---
> A file in HEAD and on the TEST branch
== When on TEST branch, diff does not works ==
$ cvs diff -r HEAD .test3
$
Thanks,
Jc
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.