[cvsnt] RE: revision 1.0 and branches

Stéphane Nicoll Stephane.Nicoll at bsb.com
Thu Jan 13 08:21:17 GMT 2005


Hello again,

Back with this. I have installed 2.0.51d and I don't have this problem !!!

I remove file with revision 1.0 on the HEAD, it's still available in the branch. Problem now is that I modify the file in my branch and I got a core dump while trying to commit it.

This is *very* annoying ...

Regards,
Stephane


-----Original Message-----
From: Stéphane Nicoll 
Sent: Wednesday, January 12, 2005 5:41 PM
To: 'cvsnt at cvsnt.org'
Subject: revision 1.0 and branches


All,

Back with my problem with more details because I was able to reproduce:

I have a branch X and two files

UnderlinedLabel.java revision 1.0 when we branched
ToolGroup.java revision 1.12 when we branched.

I have the HEAD in a sandbox and branch X in another sandbox.

# Case with revision 1.0

- I remove 1.0 on the HEAD
- File does not exist on the branch X !!!!

Before removal on HEAD (status of branch)

cvs status UnderlinedLabel.java
===================================================================
File: UnderlinedLabel.java      Status: Up-to-date

   Working revision:    1.0
   Repository revision: 1.0     /usr/local/cvs/dev/src/com/UnderlinedLabel.java,v
   Expansion option:    (default)
   Commit Identifier:   (none)
   Sticky Tag:          fwk_3_4_x (branch: 1.0.6)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)

After removal on HEAD (status of branch)


cvs update UnderlinedLabel.java
cvs server: UnderlinedLabel.java is no longer in the repository

cvs status UnderlinedLabel.java
===================================================================
File: no file UnderlinedLabel.java              Status: Up-to-date

   Working revision:    No entry for UnderlinedLabel.java
   Repository revision: 1.1     /usr/local/cvs/dev/src/com/UnderlinedLabel.java,v
   Expansion option:    kv
   Commit Identifier:   7dc41e550791541


# Case with revision 1.12

If I do the same with file B, everything is ok. Status is exactly the same before and after the removal on HEAD:

cvs status ToolGroup.java
===================================================================
File: ToolGroup.java    Status: Up-to-date

   Working revision:    1.12
   Repository revision: 1.12    /usr/local/cvs/dev/src/com/ToolGroup.java,v
   Expansion option:    kv
   Commit Identifier:   1158410130930000
   Sticky Tag:          fwk_3_4_x (branch: 1.12.2)
   Sticky Date:         (none)
   Sticky Options:      -kkv
   Merge From:          (none)

I can imagine revision 1.0 is not very compatible. How can we avoid this problem?

Thanks,
Stephane



More information about the cvsnt mailing list