info-cvs
[Top][All Lists]
Advanced

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

(no subject)


From: root
Subject: (no subject)
Date: Mon, 13 Aug 2001 05:02:22 -0400

>From address@hidden  Tue Jan 30 15:03:51 2001
>Return-Path: <address@hidden>
Received: from fencepost.gnu.org (address@hidden [199.232.76.164])
        by gateway.camelot.jp (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id 
PAA27987
        for <address@hidden>; Tue, 30 Jan 2001 15:03:45 +0900
Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14NTpz-0001va-00; Tue, 30 Jan 2001 01:00:19 -0500
Received: from cvg-29-15-110.cinci.rr.com ([24.29.15.110] 
helo=algernon.homeip.net)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14NToV-0001tJ-00
        for <address@hidden>; Tue, 30 Jan 2001 00:58:47 -0500
Received: (from address@hidden)
        by algernon.homeip.net (8.9.3/8.9.3) id AAA18808;
        Tue, 30 Jan 2001 00:58:27 -0500 (EST)
Message-Id: <address@hidden>
Subject: Re: How does CVS concurrently manage binary edits?
To: address@hidden (Patrick Salsbury)
Cc: address@hidden
In-Reply-To: <address@hidden> from "Patrick Salsbury" at Jan 29, 1 03:19:51 pm
From: address@hidden (Larry Jones)
X-Mailer: ELM [version 2.4 PL25]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: address@hidden
Errors-To: address@hidden
X-BeenThere: address@hidden
X-Mailman-Version: 2.0
Precedence: bulk
List-Help: <mailto:address@hidden>
List-Post: <mailto:address@hidden>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/info-cvs>,
        <mailto:address@hidden>
List-Id: Announcements and discussions for the CVS version control system 
<info-cvs.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/info-cvs>,
        <mailto:address@hidden>
List-Archive: <http://mail.gnu.org/pipermail/info-cvs/>
Date: Tue, 30 Jan 2001 00:58:26 -0500 (EST)
Status: O
Content-Length: 762
Lines: 19

Patrick Salsbury writes:
> 
> the question has come up several times: What
> happens if two people edit the same binary file concurrently? 

It works almost the same as with text files -- both people can do
whatever they want in their own sandboxes.  If one of them commits a
change, the other will get an "out of date" error if they try to commit
a change as well.  The difference is that when they then do an update,
CVS won't try to merge the changes; instead, it will issue a message
saying that a merge is required on an unmergable file and give the user
a copy of both versions of the file to merge by hand.

-Larry Jones

_______________________________________________
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]