Path: csiph.com!v102.xanadu-bbs.net!xanadu-bbs.net!news.mixmin.net!feeds.phibee-telecom.net!newsfeed.xs4all.nl!newsfeed2a.news.xs4all.nl!xs4all!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.006
X-Spam-Evidence: '*H*': 0.99; '*S*': 0.00; 'model,': 0.05; 'repository': 0.05; 'back.': 0.09; 'feature,': 0.09; 'git': 0.09; 'models.': 0.09; 'cc:addr:python-list': 0.11; 'changes': 0.15; 'bullet': 0.16; 'fossil': 0.16; 'from:addr:rosuav': 0.16; 'from:name:chris angelico': 0.16; 'magic': 0.16; "sun's": 0.16; 'trivially': 0.16; 'wrote:': 0.18; 'thu,': 0.19; 'seems': 0.21; 'aug': 0.22; 'cc:addr:python.org': 0.22; "aren't": 0.24; 'merge': 0.24; '(or': 0.24; 'cc:2**0': 0.24; "i've": 0.25; 'header:In- Reply-To:1': 0.27; 'point': 0.28; 'am,': 0.29; 'message- id:@mail.gmail.com': 0.30; 'changed.': 0.31; 'problem': 0.35; 'problem.': 0.35; 'but': 0.35; 'received:google.com': 0.35; 'there': 0.35; 'version': 0.36; 'thanks': 0.36; 'should': 0.36; 'too': 0.37; 'easiest': 0.38; 'files': 0.38; 'extremely': 0.39; 'skip:u 10': 0.60; 'easy': 0.60; 'most': 0.60; "you're": 0.61; 'different': 0.65; 'latest': 0.67; 'abandon': 0.84; 'subject:source': 0.84; 'to:none': 0.92; 'suffer': 0.93
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=9oZTLD0FUzJUqfPRpSGDMZ5XB3QruFKz3NOXIH4Jcqs=; b=yUOgOd4pm0pEY+LvZ6id2/HB8e7IYsqzqJZNtYAsfdd/JjsXIaNMle7+cdKSiT9lLO q+e/Gn9tPrU/NOVs7NvKpvRqFMZpqkfvkkbg1PoXU9n5rMGAtd5307zWZ4FZ3Cox6/tL ExyrcH4PbIqN/71lDm7vzRTIA2wxPSF24V9cqOJv14geF+U8K8sVp1VtCK3yaKTuxPsD 47PSsYyxKV9MQ+KnF/xZ4hOENZut1Mf6yUo6ldLqoH8IufyjPGW2krtgZobmHIvf9RAk JrqZ5at6ZKzYe9DMN/NfCM3SWC4JztwjGGHzkY9P9PSUz4T6dKdvsKKmGUQFRdzniIYG 2ycg==
MIME-Version: 1.0
X-Received: by 10.50.80.76 with SMTP id p12mr1160918igx.34.1409179618413; Wed, 27 Aug 2014 15:46:58 -0700 (PDT)
In-Reply-To: <877g1tyhvm.fsf@elektro.pacujo.net>
References: <CAKUKWzmnnrpm-9SVNAFu3G9vYf2w0ewAhnGeOge8B2NsDujamQ@mail.gmail.com> <CAL7_Mo_YOJZnHAAhHEb=CV3_QNwOm1hDGHrjZ94TVHKow-OWSg@mail.gmail.com> <CALwzid=1-VAvwW8kgjwx6w1wkF2cmcQjVUG676Ta5QEjHLKUHw@mail.gmail.com> <mailman.13445.1409041203.18130.python-list@python.org> <ltjr5j$q4o$1@dont-email.me> <CALwzidkRO_hrYamwXBk0go-w1OJ6Ty6mYB_c5vHXB6okGOLg6g@mail.gmail.com> <mailman.13498.1409125865.18130.python-list@python.org> <7xvbpd6g6w.fsf@ruckus.brouhaha.com> <877g1tyhvm.fsf@elektro.pacujo.net>
Date: Thu, 28 Aug 2014 08:46:58 +1000
Subject: Re: What is acceptable as 'open-source'?
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.13531.1409179627.18130.python-list@python.org>
Lines: 20
NNTP-Posting-Host: 2001:888:2000:d::a6
X-Trace: 1409179627 news.xs4all.nl 2899 [2001:888:2000:d::a6]:41141
X-Complaints-To: abuse@xs4all.nl
Xref: csiph.com comp.lang.python:77171

On Thu, Aug 28, 2014 at 3:14 AM, Marko Rauhamaa <marko@pacujo.net> wrote:
> Thanks for the tip. I've been looking for the magic bullet since I had
> to abandon Sun's TeamWare years back. Unfortunately, fossil seems to
> suffer from the same problem as git and hg: they all consider the whole
> repository to be the version-controlled "file". There are no independent
> changes; parallel changes always result in a conflict that requires
> merging.

This is a feature, not a problem. As far as most version control
systems are concerned, files aren't independent. However, the merge
should be trivially easy if it's different files that have changed.

If what you're concerned about is the number of merge commits, the
easiest solution is to perform rebase pulls (or to rebase a change
onto the latest tree, depending on your point of view). That's not as
easy with github's fork/merge philosophy as it is with your own
commits, but I find it's extremely easy with a pull/push model, and
not too hard with other models.

ChrisA