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

Groups > comp.lang.python > #101178

Re: We will be moving to GitHub

Show key headers only | View raw

Chris Angelico <rosuav@gmail.com>:

> On Sun, Jan 3, 2016 at 1:52 AM, Marko Rauhamaa <marko@pacujo.net> wrote:
>> Terminology aside, if I do this with Git:
>>
>>        -----+--------------------+-------->
>>              \                   ^
>>               \pull             /push
>>                v               /
>>                +--------------+
>>                      edit
>>
>> everything goes in without any further ado.
>>
>> However, this operation will be blocked by Git:
>>
>>
>>        --+--+--------------------+----+--->
>>           \  \                   ^    X
>>            \  \pull             /push/
>>             \  v               /    /
>>          pull\ +--------------+    /push
>>               \      edit         /
>>                v                 /
>>                +-----------------+
>>
>> Not so by Teamware as long as the pushes don't have files in common.
>
> Ah, I see what you mean.
>
> 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.


Marko

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