From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Narebski Subject: Re: git guidance Date: Fri, 07 Dec 2007 03:47:49 -0800 (PST) Message-ID: References: <20071129105220.v40i22q4gw4cgoso@intranet.digizenstudio.com> <200712070737.18519.a1426z@gawab.com> <475906F7.5010309@op5.se> <200712071353.11654.a1426z@gawab.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Andreas Ericsson , Johannes Schindelin , Phillip Susi , Linus Torvalds , Jing Xue , linux-kernel@vger.kernel.org, git@vger.kernel.org To: Al Boldi X-From: git-owner@vger.kernel.org Fri Dec 07 12:48:27 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1J0bgo-0002Xl-Pn for gcvg-git-2@gmane.org; Fri, 07 Dec 2007 12:48:19 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753215AbXLGLr4 (ORCPT ); Fri, 7 Dec 2007 06:47:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753114AbXLGLr4 (ORCPT ); Fri, 7 Dec 2007 06:47:56 -0500 Received: from nf-out-0910.google.com ([64.233.182.186]:34578 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752754AbXLGLrz (ORCPT ); Fri, 7 Dec 2007 06:47:55 -0500 Received: by nf-out-0910.google.com with SMTP id g13so295868nfb for ; Fri, 07 Dec 2007 03:47:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:received:x-authentication-warning:to:cc:subject:references:in-reply-to:message-id:lines:user-agent:mime-version:content-type:from:date; bh=yOKHx1VBdL/+3BmO+kzf8xLOdd7pd/MwrQG+Qf6+46U=; b=iZUlE5fWO5CCNWOMqHRgfxrGPtj/zvyJwTth1abxa/SAPPO4g0nTeQYBJjJHXifvIHuStfX72/JtL4E9gixDoI6wBQHM8NIqvPjNyv/edYfMPA2lpJUUHTm2G4PgSumwY6VHpMh24NNSnpIpIlDbJOhePrfdd36QmSHHq1Z/B7I= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=x-authentication-warning:to:cc:subject:references:in-reply-to:message-id:lines:user-agent:mime-version:content-type:from:date; b=QYU1MpJZbPu6LMzCJQSqR9rhZ8RoSh9JQF9NT7MhVET2r7eBFcS8LVB/s0svyUboQsnGMWSdHJxgX3OhxyYnkXtC+LfRAM4PkyR+c17wMhFmIeh3Z6pX/Hik12tWlCEv4ldJOQ19KwyM/Na0tjI9kwMFoN92059OrhkbVHVQBl8= Received: by 10.82.187.16 with SMTP id k16mr4430744buf.1197028070474; Fri, 07 Dec 2007 03:47:50 -0800 (PST) Received: from roke.D-201 ( [83.8.224.19]) by mx.google.com with ESMTPS id w5sm1195888mue.2007.12.07.03.47.48 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Dec 2007 03:47:49 -0800 (PST) Received: from roke (localhost.localdomain [127.0.0.1]) by roke.D-201 (8.13.4/8.13.4) with ESMTP id lB7BleHj005112; Fri, 7 Dec 2007 12:47:40 +0100 Received: (from jnareb@localhost) by roke (8.13.4/8.13.4/Submit) id lB7Blaqc005108; Fri, 7 Dec 2007 12:47:36 +0100 X-Authentication-Warning: roke: jnareb set sender to jnareb@fuw.edu.pl using -f In-Reply-To: <200712071353.11654.a1426z@gawab.com> User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.4 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Al Boldi writes: > Andreas Ericsson wrote: >> So, to get to the bottom of this, which of the following workflows is it >> you want git to support? >> >> ### WORKFLOW A ### >> edit, edit, edit >> edit, edit, edit >> edit, edit, edit >> Oops I made a mistake and need to hop back to "current - 12". >> edit, edit, edit >> edit, edit, edit >> publish everything, similar to just tarring up your workdir and sending >> out ### END WORKFLOW A ### >> >> ### WORKFLOW B ### >> edit, edit, edit >> ok this looks good, I want to save a checkpoint here >> edit, edit, edit >> looks good again. next checkpoint >> edit, edit, edit >> oh crap, back to checkpoint 2 >> edit, edit, edit >> ooh, that's better. save a checkpoint and publish those checkpoints >> ### END WORKFLOW B ### > > ### WORKFLOW C ### > for every save on a gitfs mounted dir, do an implied checkpoint, commit, or > publish (should be adjustable), on its privately created on-the-fly > repository. > ### END WORKFLOW C ### It looks like it is WORKFLOW A (with the fact that each ',' is file save stated explicitely rather than implicitely). > For example: > > echo "// last comment on this file" >> /gitfs.mounted/file > > should do an implied checkpoint, and make these checkpoints immediately > visible under some checkpoint branch of the gitfs mounted dir. > > Note, this way the developer gets version control without even noticing, and > works completely transparent to any kind of application. Why not use versioning filesystem for that, for example ext3cow (which looks suprisingly git-like, when you take into account that for ext3cow history is linear and centralized, so one can use date or sequential number to name commits). See GitLinks page on Git Wiki, "Other links" section: http://www.ext3cow.com/ Version control system is all about WORKFLOW B, where programmer controls when it is time to commit (and in private repository he/she can then rewrite history to arrive at "Perfect patch series"[*1*]); something that for example CVS failed at, requiring programmer to do a merge if upstream has any changes when trying to commit. [*1*] I have lost link to post at LKML about rewriting history to arrive at perfect patch _series_. IIRC I have found it first time on this mailing list. I would be grateful for sending this link if you have it. TIA. -- Jakub Narebski ShadeHawk on #git