Received: from spf3.us4.outblaze.com (spf3.us4.outblaze.com [205.158.62.25]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id i9PFnuMf015217 for ; Mon, 25 Oct 2004 15:49:57 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf3.us4.outblaze.com (Postfix) with ESMTP id BDFEA538FA for ; Mon, 25 Oct 2004 15:49:55 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CM7EC-0000tR-9P for migo@homemail.com; Mon, 25 Oct 2004 11:57:48 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CM7DX-0000nO-EZ for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 11:57:07 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CM7DW-0000ms-FH for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 11:57:06 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CM7DW-0000mi-B9 for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 11:57:06 -0400 Received: from [80.91.229.2] (helo=main.gmane.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CM75j-0007ed-VQ for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 11:49:04 -0400 Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1CM75j-0005yA-00 for ; Mon, 25 Oct 2004 17:49:03 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: gnu-arch-users@gnu.org From: John Goerzen Date: Mon, 25 Oct 2004 15:48:27 +0000 (UTC) Organization: Complete.Org Message-ID: References: X-Complaints-To: usenet@complete.org User-Agent: slrn/0.9.8.1 (Debian) Subject: [Gnu-arch-users] Re: Automatic Disconnected Operation X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 1793 Lines: 39 On 2004-10-25, Stefan Monnier wrote: >> Lately I hve been poking around with darcs a bit, and the one really >> nice thing about it is that it can automatically work "disconnected". > >> Here's how that would work in darcs: > >> 1. I do a darcs get to download the repository >> 2. I hack around, using "darcs record" to commit each change >> Changes are only saved locally. >> 3. When I have a network connection again, I "darcs push" to upload >> my changes to the server. > > How does it handle the case where someone else has committed patches to the > same branch in the mean time. Of course it can try to reorder those patches > using its patch-algebra (which is quite handy in this particular case), but > what if there's a real conflict? I don't know, but I bet someone in here knows the answer. I suspect it would generate an error if it couldn't handle the situation automatically. If I knew someone else commits to the repository on the network (in my case, I know that nobody else does), I would probably do a darcs pull before my darcs push to grab any changes and integrate them. >> B. I could mirror the remote repository to my local disk. >> Problems: >> 1. I can't commit to this, or push changes back. >> 2. Still takes a good deal of typing. > >> Is there an easier way to do this? > > You can use an archive cache (in a separate patch written by Aaron) which > gets you the same as B but without the extra typing (you still can't > commit, tho). And that's still a big problem, unfortunately. -- John _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/