Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > comp.lang.python > #101180

Re: We will be moving to GitHub

Path csiph.com!fu-berlin.de!uni-berlin.de!not-for-mail
From Chris Angelico <rosuav@gmail.com>
Newsgroups comp.lang.python
Subject Re: We will be moving to GitHub
Date Sun, 3 Jan 2016 11:42:04 +1100
Lines 24
Message-ID <mailman.188.1451781733.11925.python-list@python.org> (permalink)
References <n66kmg$ig$1@ger.gmane.org> <CAPTjJmq1Qevy7h4pqrQPobLRO-_ooLrXsZhK9Z9YCKPyFnxKsQ@mail.gmail.com> <CAKJDb-MFM6i+MMZXcPkV6x-rFnKr9Yxt4f3ne1dF3dk_SkoFpw@mail.gmail.com> <mailman.146.1451678991.11925.python-list@python.org> <5687718d$0$1612$c3e8da3$5496439d@news.astraweb.com> <87oad41fd4.fsf@elektro.pacujo.net> <mailman.158.1451730569.11925.python-list@python.org> <87k2ns1b0d.fsf@elektro.pacujo.net> <mailman.159.1451734854.11925.python-list@python.org> <87ege012i5.fsf@elektro.pacujo.net> <mailman.165.1451745521.11925.python-list@python.org> <87a8oo11b4.fsf@elektro.pacujo.net> <mailman.167.1451747904.11925.python-list@python.org> <8737uf1oyx.fsf@elektro.pacujo.net>
Mime-Version 1.0
Content-Type text/plain; charset=UTF-8
X-Trace news.uni-berlin.de t9SaS7SlP2AE8TA/26wgCQSrY75iDpXXF5t+UyEr55ag==
Return-Path <rosuav@gmail.com>
X-Original-To python-list@python.org
Delivered-To python-list@mail.python.org
X-Spam-Status OK 0.005
X-Spam-Evidence '*H*': 0.99; '*S*': 0.00; 'discard': 0.05; 'repository': 0.05; 'pretend': 0.07; 'cc:addr:python-list': 0.09; 'decision.': 0.09; 'git': 0.09; 'jan': 0.11; 'files.': 0.13; 'commit': 0.15; '2016': 0.16; 'amended': 0.16; 'file?': 0.16; 'from:addr:rosuav': 0.16; 'from:name:chris angelico': 0.16; 'received:io': 0.16; 'received:psf.io': 0.16; 'wrote:': 0.16; 'merge': 0.18; 'cc:2**0': 0.20; 'cc:addr:python.org': 0.20; 'ones.': 0.22; 'am,': 0.23; '(this': 0.24; 'header:In-Reply-To:1': 0.24; 'equivalent': 0.27; 'separate': 0.27; 'message- id:@mail.gmail.com': 0.27; 'correct': 0.28; 'thus,': 0.29; 'instead,': 0.33; 'point,': 0.33; 'changing': 0.34; 'file': 0.34; 'received:google.com': 0.35; 'done': 0.35; 'clear': 0.35; 'should': 0.36; 'received:209.85': 0.36; 'possible': 0.36; 'subject:: ': 0.37; 'two': 0.37; 'received:209.85.213': 0.37; 'received:209': 0.38; 'someone': 0.38; 'why': 0.39; "didn't": 0.39; 'your': 0.60; 'per': 0.62; 'different': 0.63; 'picked': 0.66; 'choose': 0.68; 'chrisa': 0.84; 'dramatically': 0.84; 'presumably': 0.84; 'viable': 0.84; 'to:none': 0.91
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=67VdbsLRG51j2LhZxBwWaiRJGq0Oy6a3n7sNSxeBpqI=; b=bvWWXExzUVshJ0ZY9JqxlG0OnbXw5+7GsxPJAINypd4joMlmmiDt/bxvZu8qEzZj+t mh/lKmSBAyGl7TmzkkpYBJJtJrvpOllX+xQ3khqMyjjcn5b2u4dYtrCklT53q5AjxVqI ywbFNohn8FMoEhTiWjg665VxkuisbL5CH0Plmf+KFLIb2S5rj3iEJaYMuaqYQsr17SqR 46/lAqv+eoYT+vxM0LD4sPq7mYIvqbUHo5ZSegdnihfyHdtDVjLyLBNJFcqMYlEFx//g SNduaT7voB+Fedh3rO5WlUypD1THd//RZYSnfgYR9rTKwLAwC5gVMgPjm+73lL7ImgGn QrWQ==
X-Received by 10.50.119.104 with SMTP id kt8mr2685378igb.13.1451781724903; Sat, 02 Jan 2016 16:42:04 -0800 (PST)
In-Reply-To <8737uf1oyx.fsf@elektro.pacujo.net>
X-BeenThere python-list@python.org
X-Mailman-Version 2.1.20+
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>
Xref csiph.com comp.lang.python:101180

Show key headers only | View raw

On Sun, Jan 3, 2016 at 11:33 AM, Marko Rauhamaa <marko@pacujo.net> wrote:
>> That's a constantly-debated point, and it's actually possible to make
>> git accept this, although it's not a normal workflow. Instead, you
>> just 'git pull' (possibly with --rebase) before you 'git push'. You
>> either create a new merge commit, or make it very clear that you are
>> changing your commits to pretend they were committed after the
>> already-pushed ones. Or you do a force-push and discard the other
>> commits (this is correct if you amended a commit). You HAVE to choose
>> because these are three viable solutions, and only a human can make
>> the decision.
>>
>> Teamware presumably picked one of them,
>
> Teamware didn't have to pick any of them since Teamware's commits were
> done per individual files. The repository didn't have a commit history.
>
> Thus, Teamware was equivalent to Hg/Git with each file treated as an
> independent repository.

And what if you and someone else edit different parts of the same
file? How is that handled? Why should the top and bottom of one file
be dramatically different from two separate files?

ChrisA

Back to comp.lang.python | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: We will be moving to GitHub Chris Angelico <rosuav@gmail.com> - 2016-01-02 07:09 +1100
  Re: We will be moving to GitHub Steven D'Aprano <steve@pearwood.info> - 2016-01-02 17:43 +1100
    Re: We will be moving to GitHub Chris Angelico <rosuav@gmail.com> - 2016-01-02 18:12 +1100
    Re: We will be moving to GitHub Marko Rauhamaa <marko@pacujo.net> - 2016-01-02 11:48 +0200
      Re: We will be moving to GitHub Chris Angelico <rosuav@gmail.com> - 2016-01-02 21:29 +1100
        Re: We will be moving to GitHub Marko Rauhamaa <marko@pacujo.net> - 2016-01-02 13:22 +0200
          Re: We will be moving to GitHub Chris Angelico <rosuav@gmail.com> - 2016-01-02 22:40 +1100
            Re: We will be moving to GitHub Marko Rauhamaa <marko@pacujo.net> - 2016-01-02 16:26 +0200
              Re: We will be moving to GitHub Chris Angelico <rosuav@gmail.com> - 2016-01-03 01:38 +1100
                Re: We will be moving to GitHub Marko Rauhamaa <marko@pacujo.net> - 2016-01-02 16:52 +0200
                Re: We will be moving to GitHub Chris Angelico <rosuav@gmail.com> - 2016-01-03 02:12 +1100
                Re: We will be moving to GitHub Marko Rauhamaa <marko@pacujo.net> - 2016-01-03 02:33 +0200
                Re: We will be moving to GitHub Chris Angelico <rosuav@gmail.com> - 2016-01-03 11:42 +1100
                Re: We will be moving to GitHub Marko Rauhamaa <marko@pacujo.net> - 2016-01-03 03:14 +0200
                Re: We will be moving to GitHub m <mvoicem@gmail.com> - 2016-01-04 11:13 +0100
                Re: We will be moving to GitHub Marko Rauhamaa <marko@pacujo.net> - 2016-01-04 13:28 +0200
      Re: We will be moving to GitHub Thomas 'PointedEars' Lahn <PointedEars@web.de> - 2016-01-04 23:53 +0100
    Re: We will be moving to GitHub Tim Chase <python.list@tim.thechases.com> - 2016-01-02 06:58 -0600
    Re: We will be moving to GitHub Michael Torrie <torriem@gmail.com> - 2016-01-02 20:24 -0700

csiph-web