Path: csiph.com!v102.xanadu-bbs.net!xanadu-bbs.net!news.albasani.net!news.stack.nl!newsfeed.xs4all.nl!newsfeed4.news.xs4all.nl!xs4all!news.tele.dk!news.tele.dk!small.news.tele.dk!newsgate.cistron.nl!newsgate.news.xs4all.nl!post.news.xs4all.nl!not-for-mail
Return-Path: <rosuav@gmail.com>
X-Original-To: python-list@python.org
Delivered-To: python-list@mail.python.org
X-Spam-Status: OK 0.003
X-Spam-Evidence: '*H*': 0.99; '*S*': 0.00; '16,': 0.03; 'subject:: [': 0.04; 'say,': 0.05; 'subject:Question': 0.07; 'branching': 0.09; 'experimental': 0.09; 'git': 0.09; 'instance.': 0.09; 'mercurial': 0.09; 'merging': 0.09; 'cc:addr:python-list': 0.11; 'from:addr:rosuav': 0.16; 'from:name:chris angelico': 0.16; 'personally,': 0.16; 'redundant.': 0.16; 'subject:branches': 0.16; 'wrote:': 0.18; 'subject:] ': 0.20; '>>>': 0.22; 'separate': 0.22; 'cc:addr:python.org': 0.22; 'directory.': 0.24; 'cc:2**0': 0.24; "i've": 0.25; 'header:In-Reply-To:1': 0.27; 'chris': 0.29; 'message-id:@mail.gmail.com': 0.30; "i'm": 0.30; 'too.': 0.31; '>>>>': 0.31; 'branches': 0.31; "d'aprano": 0.31; 'encouraged': 0.31; 'sep': 0.31; 'steven': 0.31; 'probably': 0.32; 'there,': 0.34; 'advice': 0.35; 'but': 0.35; 'received:google.com': 0.35; 'there': 0.35; 'done': 0.36; 'should': 0.36; 'operating': 0.37; 'branch': 0.38; 'pm,': 0.38; 'rather': 0.38; 'little': 0.38; 'explain': 0.39; 'enough': 0.39; 'either': 0.39; 'even': 0.60; 'then,': 0.60; "you're": 0.61; "you'll": 0.62; 'pick': 0.64; 'different': 0.65; 'within': 0.65; 'to,': 0.72; 'listening': 0.74; 'etc,': 0.84; 'to:none': 0.92
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:cc :content-type; bh=XJVA83e1YHqry/yq7LJYabK5Wu5XIsE/sdDKTwIRc1E=; b=SJ4zbX3P14ZfJuGF90iiU0zLsQmys8uBAkyCmI/0Ydo3FeYLFBrTs9gZA0oF4mr4aS r8ZuoCHvY8umsgMgVq38iG06BYg5pHaM0mNbGdaxSjoXVWyPXhtChcUQ/MEUxm/mMw26 axfpXZQSCdVh7qURZAB5BqTq5J6wFoNBy7ANRJaFEl5z5gu83NcgA+kSap6ON/uK0P/7 JIYchCKobZKl4q4QAU3jORbuPJjIVkC+Ntcgjy0qSibujSyRewJmHCJdksE4sgPQlAEh mwmqyNqIV/NMVX7JKP8A2QX27MoeMhCsbwt62WqMv6d18ERdc5wVvgx22b7IBAnqdcVj 2z7Q==
MIME-Version: 1.0
X-Received: by 10.112.183.233 with SMTP id ep9mr34353416lbc.56.1410871725515; Tue, 16 Sep 2014 05:48:45 -0700 (PDT)
In-Reply-To: <541829b4$0$29995$c3e8da3$5496439d@news.astraweb.com>
References: <mailman.14043.1410848545.18130.python-list@python.org> <878ulk7z7y.fsf@elektro.pacujo.net> <mailman.14046.1410856162.18130.python-list@python.org> <541829b4$0$29995$c3e8da3$5496439d@news.astraweb.com>
Date: Tue, 16 Sep 2014 22:48:45 +1000
Subject: Re: [OT] Question about Git branches
From: Chris Angelico <rosuav@gmail.com>
Cc: "python-list@python.org" <python-list@python.org>
Content-Type: text/plain; charset=UTF-8
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.14055.1410871728.18130.python-list@python.org>
Lines: 34
NNTP-Posting-Host: 2001:888:2000:d::a6
X-Trace: 1410871728 news.xs4all.nl 2895 [2001:888:2000:d::a6]:39987
X-Complaints-To: abuse@xs4all.nl
Xref: csiph.com comp.lang.python:77932

On Tue, Sep 16, 2014 at 10:14 PM, Steven D'Aprano
<steve+comp.lang.python@pearwood.info> wrote:
> Chris Angelico wrote:
>
>> On Tue, Sep 16, 2014 at 6:21 PM, Marko Rauhamaa <marko@pacujo.net> wrote:
>>> "Frank Millman" <frank@chagford.com>:
>>>
>>>> You are encouraged to make liberal use of 'branches',
>>>
>>> Personally, I only use forks, IOW, "git clone". I encourage that
>>> practice. Then, there is little need for "git checkout". Instead, I just
>>> cd to a different directory.
>>>
>>> Branches and clones are highly analogous processwise; I would go so far
>>> as to say that they are redundant.
>>
>> But rather than listening to, shall we say, *strange* advice like
>> this, Frank, you'll do well to pick up a reliable git tutorial, which
>> should explain branches, commits, the working tree, etc, etc, etc.
>
> Isn't this "strange advice" standard operating procedure in Mercurial? I'm
> not an expert on either hg or git, but if I've understood hg correctly, the
> way to begin an experimental branch is to use hg clone.

I don't know Mercurial well enough to be able to say, but definitely
branching is a very normal thing there, too. And since merging can be
done only within a single repo, ultimately you need to end up with
branches in one repo (rather than separate repos) if you're going to
combine them in any way. So even if you do start some experimental
work in a separate clone, you're probably going to need to end up with
it as a separate branch in the same repo if you ever publish it, for
instance.

ChrisA