info-cvs
[Top][All Lists]
Advanced

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

Re: edit document in several branches simultaneously


From: Paul Gelderblom \(ptok\)
Subject: Re: edit document in several branches simultaneously
Date: Thu, 19 Feb 2004 21:10:55 +0100

edit -c (regrettably in my opinion) is not a part of the official version of
CVS which is the subject of this mailing list. There is a patch available
(see http://mail.gnu.org/archive/html/info-cvs/2003-12/msg00135.html)
which gives you cvs edit -c in the "standard" cvs, but it is more likely you
are talking to a cvsnt server (find out using "cvs version"). See
www.cvsnt.com for info on that cvs server flavour.

The version of edit -c I know indeed behave as you describe :
edit -c foo
locks all versions of the foo file on all branches - so it is intended
behaviour. Your server is not broken. But it is probably still not what you
want.

It may be the case that the RCS lock (cvs admin -l) does give you the
opportunity to
lock only certain revisions of a file. But I'm not an expert on that one.
And admin -l may not be supported by TortoiseCvs.

Paul Gelderblom

----- Original Message ----- 
From: "Axel Benz" <address@hidden>
To: <address@hidden>
Sent: Thursday, February 19, 2004 13:46
Subject: edit document in several branches simultaneously


> Hi,
> this is a newby question.
> I am using CVS with the TortoiseCVS client. This client opens files always
> with the
> cvs edit -c
> command, which makes sense in my case, because I am working only with
binary
> files and concurrent editing would lead to unsolvable conflicts.
> The problem is that, when the versioning path is branched, with
> cvs edit -c mydocument
> mydocument is "locked" (better: tagged as being edited) in both branches.
> In my opinion, this does not make sense, since the versions of the
document
> reside in different branches and can be totally different from each other.
>
> Why behaves CVS like this? Is there a certain sense in it? Can I prevent
CVS
> from doing so? Or should the client use another command? Which one? Or is
> this a bug of the CVS server I am using?
>
> Thank you for hints,
>
> Axel
>
> ________________________________________
> Fraunhofer Institut fuer
> Arbeitswirtschaft und Organisation (IAO)
> Dipl. Inf. Axel Benz
> Nobelstr. 12
> D-70569 Stuttgart
> Germany
> Tel. +49(0)7119702289
> Fax. +49(0)7119702401
> mail: mailto:address@hidden
> www.vis.iao.fhg.de
> www.m-lab.iao.fhg.de
> ________________________________________
>
>
>
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs
>
>





reply via email to

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