[cvsnt] Re: error in branch with binary-delta-files (-kB)
Gerd
Gerd at WinklerNet.de
Fri Feb 27 10:32:31 GMT 2004
Hi Tony,
here the log from the binary-file:
============================================================================
======================
cvs -z9 log ERH.PAN (in directory C:\MKZ\ERH\SYS\)
***** CVS exited normally with code 0 *****
Rcs file : 'C:/Freigaben/CVS/mkz/ERH/SYS/ERH.PAN,v'
Working file : 'ERH.PAN'
Head revision : 1.13
Branch revision :
Locks : strict
Access :
Symbolic names :
1.11.0.2 : 'ERH-04-90-12-branch'
1.8 : 'ERH-04-90-07'
1.11 : 'ERH-04-90-12'
1.11 : 'ERH-04-90-11'
1.10 : 'ERH-04-90-10'
1.9 : 'ERH-04-90-09'
1.8 : 'ERH-04-90-06'
1.6 : 'ERH-04-90-05'
1.5 : 'ERH-04-90-04'
1.5 : 'ERH-04-90-03'
1.5 : 'v04-90-03'
1.4 : 'v04-90-02'
1.3 : 'v04-90-01'
1.1 : 'v04-90-00'
Keyword substitution : ''
Total revisions : 0
Selected revisions : 0
Description :
B
total revisions: 14; selected revisions: 14
description:
----------------------------
Revision : 1.13
Date : 2004/2/24 7:23:30
Author : 'GWinkler'
State : 'Exp'
Lines : +0 0
Description :
B; commitid: 2fa0403afbd30000;
Fehlermeldung 4.90 QS 1
Ausnahmedaten Protection=No
Masken: 214j,214n,322u,322y,723h,824j,851j,767j,885j,8a1j
Ersatzteile (SMR) Norder=No, Font=1, Color=8, Column=245
Masken: 1161,2141,2143,322q,322v,7230,8241,8510,7671,8851,8a11
----------------------------
Revision : 1.12
Date : 2003/12/22 15:1:59
Author : 'GWinkler'
State : 'Exp'
Lines : +3 -3
Keyword : 'b'
CommitID : '112c3fe7071e0000'
Description :
MSK8651 (ZZZ.ZZZ -> ZZZZZ9)
----------------------------
Revision : 1.11
Date : 2003/11/17 16:6:37
Author : 'GWinkler'
State : 'Exp'
Lines : +95 -90
Branches :
1.11.2
Keyword : 'b'
CommitID : 'f283fb8f1a50000'
Description :
Feldbezeichnung bei Sortiermasken aufgenommen (für Hilfe)
----------------------------
Revision : 1.10
Date : 2003/11/11 16:7:13
Author : 'GWinkler'
State : 'Exp'
Lines : +147 -117
Keyword : 'b'
CommitID : '14903fb109120000'
Description :
div. Anpassungen
----------------------------
Revision : 1.9
Date : 2003/11/2 15:33:56
Author : 'GWinkler'
State : 'Exp'
Lines : +1420 -1453
Keyword : 'b'
CommitID : '11443fa523c50000'
Description :
Speichern mit F10 / MSK1300/1400 BzEK
----------------------------
Revision : 1.8
Date : 2003/10/19 11:23:14
Author : 'GWinkler'
State : 'Exp'
Lines : +786 -777
Keyword : 'b'
CommitID : '10783f9274030000'
Description :
1501/158 (CALS) reorganisiert
----------------------------
Revision : 1.7
Date : 2003/10/19 11:14:26
Author : 'GWinkler'
State : 'Exp'
Lines : +652 -601
Keyword : 'b'
CommitID : '11303f92720d0000'
Description :
Äf 1501/158 (erw. CALS-Daten)
----------------------------
Revision : 1.6
Date : 2003/10/6 18:18:43
Author : 'GWinkler'
State : 'Exp'
Lines : +471 -402
Keyword : 'b'
CommitID : 'a403f81b1ff0000'
Description :
Anp. 1501/151 DatPrüfen
----------------------------
Revision : 1.5
Date : 2003/9/2 8:5:28
Author : 'GWinkler'
State : 'Exp'
Lines : +18 -17
Keyword : 'b'
CommitID : 'f83f544f430000'
Description :
Anp. wg. Äf 1501/155 Vorrat-LAE (I1400)
----------------------------
Revision : 1.4
Date : 2003/8/13 14:47:24
Author : 'GWinkler'
State : 'Exp'
Lines : +547 -511
Keyword : 'b'
CommitID : 'e53f3a4f750000'
Description :
Version 4.90.2
----------------------------
Revision : 1.3
Date : 2003/7/16 15:52:8
Author : 'GWinkler'
State : 'Exp'
Lines : +419 -412
Keyword : 'b'
CommitID : 'b63f1574a60000'
Description :
neue Masken,FILELIST und TEXTSUCH
----------------------------
Revision : 1.2
Date : 2003/6/30 10:58:14
Author : 'GHWW'
State : 'Exp'
Lines : +3319 -2913
Keyword : 'b'
CommitID : 'e03f00132e0000'
Description :
aktueller Zwischenstand
----------------------------
Revision : 1.1
Date : 2003/5/16 12:29:27
Author : 'GHWW'
State : 'Exp'
Lines : +0 0
Description :
1, Umsetztung erh.msk -> erh.pan mit man. Anpassung
----------------------------
Revision : 1.11.2.1
Date : 2004/2/24 7:21:30
Author : 'GWinkler'
State : 'Exp'
Lines : +0 0
Description :
B; commitid: 2ac0403afb5b0000;
Fehlermeldung 4.90 QS 1
Ausnahmedaten Protection=No
Masken: 214j,214n,322u,322y,723h,824j,851j,767j,885j,8a1j
Ersatzteile (SMR) Norder=No, Font=1, Color=8, Column=245
Masken: 1161,2141,2143,322q,322v,7230,8241,8510,7671,8851,8a11
===============================================
============================================================================
======================
and the cvs-version
cvs -v
Concurrent Versions System (CVSNT) 2.0.28 (client/server)
Copyright (c) 1989-2001 Brian Berliner, david d `zoo' zuhn,
Jeff Polk, and other authors
CVSNT version (Feb 12 2004) Copyright (c) 1999-2003 Tony Hoyle and others
see http://www.cvsnt.org
CVS may be copied only under the terms of the GNU General Public License,
a copy of which can be found with the CVS distribution kit.
SSH connectivity provided by PuTTY:
PuTTY is copyright 1997-2001 Simon Tatham.
Portions copyright Robert de Bath, Joris van Rantwijk, Delian
Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
Justin Bradford, and CORE SDI S.A.
see http://www.chiark.greenend.org.uk/~sgtatham/putty/
Specify the --help option for further information about CVS
============================================================
============================================================================
======================
I think the problem is rev 1.11 (Keyword : 'b') where the branch (Branches :
1.11.2) started.
After checkout the branch, the option for this file in my sandbox is '-kB'
(CVS/entries).
Here a little history of the binary-file:
Fist (cvsnt < 2.0.24) I create the file with option '-kb'.
Then there are any changes.
With using version 2.0.24 I changed the option to '-kB' (cvs admin -kB
file) - (update file).
Later I create the branch 'ERH-04-90-12-branch' from tag 'ERH-04-90-12' and
checkout in a new sandbox.
Now I make changes in main and branch.
The commits are ok.
The update for main in other sandbox is ok, but the branch-update in other
sandbox creates the error.
I use to checkout the branch in a new sandbox, but the error still there.
Thanks
Gerd
"Tony Hoyle" <tmh at nodomain.org> schrieb im Newsbeitrag
news:c1gd3k$anh$1 at sisko.local.nodomain.org...
> Gerd wrote:
>
> > Help!
> > I'm changed a -kB binary-File in my branch-sandbox.
> >
> > Other user will update her branch-sandbox, but he became the error:
> > cvs [server aborted]: Attempting text operation on binary linevector
>
> I can't repeat this... need more information. How did you change the
> file - do you mean you used admin -kB on an file? Please post the exact
> steps required to cause the problem. A simple update can't in fact
> cause this (in fact I can't see any codepath that could).
>
> The output of 'cvs version' from within the sandbox would be useful too.
>
> The CVSROOT thing looks separate... You need to use the ChangeRoot
> macro if you want to change the cvsroot after checking out.
>
> Tony
More information about the cvsnt
mailing list