Path: csiph.com!v102.xanadu-bbs.net!xanadu-bbs.net!feeder.erje.net!eu.feeder.erje.net!newsfeed.xs4all.nl!newsfeed1.news.xs4all.nl!xs4all!newsgate.cistron.nl!newsgate.news.xs4all.nl!post.news.xs4all.nl!not-for-mail
Return-Path: <python-python-list@m.gmane.org>
X-Original-To: python-list@python.org
Delivered-To: python-list@mail.python.org
X-Spam-Status: OK 0.008
X-Spam-Evidence: '*H*': 0.98; '*S*': 0.00; 'subject:Question': 0.07; 'git': 0.09; 'received:80.91': 0.09; 'received:80.91.229': 0.09; 'received:gmane.org': 0.09; 'received:list': 0.09; 'subject:Source': 0.09; 'wrote': 0.14; 'changes': 0.15; 'received:80.91.229.3': 0.16; 'received:plane.gmane.org': 0.16; 'titled': 0.16; 'appropriate': 0.16; 'do,': 0.16; 'wrote:': 0.18; '>>>': 0.22; 'merge': 0.24; 'scroll': 0.24; 'source': 0.25; 'header:X-Complaints-To:1': 0.27; 'chris': 0.29; "doesn't": 0.30; 'code': 0.31; "d'aprano": 0.31; 'steven': 0.31; 'there': 0.35; 'half': 0.37; 'to:addr:python-list': 0.38; 'pm,': 0.38; 'does': 0.39; 'to:addr:python.org': 0.39; 'received:org': 0.40; 'according': 0.40; 'real': 0.63; 'more': 0.64; 'believe': 0.68; 'mar': 0.68; '"one': 0.84; 'subject:Control': 0.84; 'joel': 0.91
X-Injected-Via-Gmane: http://gmane.org/
To: python-list@python.org
From: Dave Angel <davea@davea.name>
Subject: Re: Question about Source Control
Date: Tue, 18 Mar 2014 16:51:41 -0400 (EDT)
Organization: news.gmane.org
References: <lg6s09$irl$1@ger.gmane.org> <CAPTjJmqPca5cnNWu8T5BZhpH665X0=mrf7bJaLqVrQVMjZWu1g@mail.gmail.com> <lg8m6b$c8t$1@ger.gmane.org> <CAPTjJmqHXh2M3-QGbeLV_AkGAJzMEYmbuDLy8_dkpnhrpSUVMQ@mail.gmail.com> <lg8prm$gs0$1@ger.gmane.org> <mailman.8239.1395125283.18130.python-list@python.org> <5327fc07$0$2923$c3e8da3$76491128@news.astraweb.com> <mailman.8247.1395130100.18130.python-list@python.org> <53284dee$0$29994$c3e8da3$5496439d@news.astraweb.com>
X-Gmane-NNTP-Posting-Host: dpc6744198232.direcpc.com
X-Newsreader: PiaoHong Usenet NewsReaders 1.36
X-BeenThere: python-list@python.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: General discussion list for the Python programming language <python-list.python.org>
List-Unsubscribe: <https://mail.python.org/mailman/options/python-list>, <mailto:python-list-request@python.org?subject=unsubscribe>
List-Archive: <http://mail.python.org/pipermail/python-list/>
List-Post: <mailto:python-list@python.org>
List-Help: <mailto:python-list-request@python.org?subject=help>
List-Subscribe: <https://mail.python.org/mailman/listinfo/python-list>, <mailto:python-list-request@python.org?subject=subscribe>
Newsgroups: comp.lang.python
Message-ID: <mailman.8261.1395175636.18130.python-list@python.org>
Lines: 30
NNTP-Posting-Host: 2001:888:2000:d::a6
X-Trace: 1395175636 news.xs4all.nl 2834 [2001:888:2000:d::a6]:39323
X-Complaints-To: abuse@xs4all.nl
Xref: csiph.com comp.lang.python:68517

 Steven D'Aprano <steve+comp.lang.python@pearwood.info> Wrote in
 message:
> On Tue, 18 Mar 2014 19:08:17 +1100, Chris Angelico wrote:
> 
>> On Tue, Mar 18, 2014 at 6:55 PM, Steven D'Aprano <steve@pearwood.info>
>> wrote:
>>> I don't think that *version* control is the right model to describe
>>> what hg and git do, although it may be appropriate for subversion. hg
>>> doesn't manage *versions*, it manages changes to source code
>>> ("changesets").
>> 
>> Meh... Is there any real difference? 
> 
> If you believe Joel Spolsky, there is:
> 
> http://hginit.com/00.html
> 
> Scroll down about half way, to the section titled "One more big 
> conceptual difference".
> 
> Recording *snapshots* versus recording *diffs* makes a considerable 
> difference when it comes to dealing with merge conflicts.
> 

So which does git do, according to this model? 


-- 
DaveA