[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Log data for branches
From: |
Mike Ayers |
Subject: |
Log data for branches |
Date: |
Tue, 25 Mar 2003 15:20:50 -0800 |
I created a test project to illustrate a problem that I am having. I
added a file, SwingApplication.java, then branched branch1. I made some
changes in SwingApplication.java for both files, then added a new file,
SwingApplication2.java, on the main branch.
Here's the log output:
<SNIP>
C:\mike\wrk\btest\branch1\z1>cvs log
? SwingApplication$1.class
? SwingApplication$2.class
? SwingApplication.class
cvs server: Logging .
RCS file: /export/cvs/personal/mayers/testing123/z1/SwingApplication.java,v
Working file: SwingApplication.java
head: 1.2
branch:
locks: strict
access list:
symbolic names:
branch1: 1.1.0.2
keyword substitution: kv
total revisions: 5; selected revisions: 5
description:
----------------------------
revision 1.2
date: 2003/03/25 21:15:01; author: mayers; state: Exp; lines: +1 -1
Says "Click Me!" now.
----------------------------
revision 1.1
date: 2003/03/25 21:10:06; author: mayers; state: Exp;
branches: 1.1.2;
Initial checkin
----------------------------
revision 1.1.2.3
date: 2003/03/25 22:45:07; author: mayers; state: Exp; lines: +1 -1
Enough space to count to at least 999.
----------------------------
revision 1.1.2.2
date: 2003/03/25 22:43:17; author: mayers; state: Exp; lines: +4 -3
Improved feedback
----------------------------
revision 1.1.2.1
date: 2003/03/25 21:19:37; author: mayers; state: Exp; lines: +2 -2
Button push paradigm
=============================================================================
RCS file: /export/cvs/personal/mayers/testing123/z1/SwingApplication2.java,v
Working file: SwingApplication2.java
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2; selected revisions: 2
description:
----------------------------
revision 1.2
date: 2003/03/25 22:48:26; author: mayers; state: Exp; lines: +4 -3
Better label.
----------------------------
revision 1.1
date: 2003/03/25 22:30:56; author: mayers; state: Exp;
countdown version: initial checkin
=============================================================================
</SNIP>
Looks good. Now, I want to get a log of checkins for files on the
"branch1" branch:
<SNIP>
C:\mike\wrk\btest\branch1\z1>cvs log -rbranch1
? SwingApplication$1.class
? SwingApplication$2.class
? SwingApplication.class
cvs server: Logging .
RCS file: /export/cvs/personal/mayers/testing123/z1/SwingApplication.java,v
Working file: SwingApplication.java
head: 1.2
branch:
locks: strict
access list:
symbolic names:
branch1: 1.1.0.2
keyword substitution: kv
total revisions: 5; selected revisions: 3
description:
----------------------------
revision 1.1.2.3
date: 2003/03/25 22:45:07; author: mayers; state: Exp; lines: +1 -1
Enough space to count to at least 999.
----------------------------
revision 1.1.2.2
date: 2003/03/25 22:43:17; author: mayers; state: Exp; lines: +4 -3
Improved feedback
----------------------------
revision 1.1.2.1
date: 2003/03/25 21:19:37; author: mayers; state: Exp; lines: +2 -2
Button push paradigm
=============================================================================
cvs server: warning: no revision `branch1' in `/export/cvs/personal/mayers/testi
ng123/z1/SwingApplication2.java,v'
RCS file: /export/cvs/personal/mayers/testing123/z1/SwingApplication2.java,v
Working file: SwingApplication2.java
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2; selected revisions: 2
description:
----------------------------
revision 1.2
date: 2003/03/25 22:48:26; author: mayers; state: Exp; lines: +4 -3
Better label.
----------------------------
revision 1.1
date: 2003/03/25 22:30:56; author: mayers; state: Exp;
countdown version: initial checkin
=============================================================================
C:\mike\wrk\btest\branch1\z1>
</SNIP>
Note what happened for SwingApplication2.java - a warning was printed,
then all file checkins were displayed. This is the problem. When I run
cvs2cl.pl on my branch, I am getting all the checkins on files not on the
branch which didn't exist when the branch was created.
How can I limit logging to files which exist on a branch?
Thanks,
/|/|ike
- Log data for branches,
Mike Ayers <=