Path: csiph.com!x330-a1.tempe.blueboxinc.net!usenet.pasdenom.info!aioe.org!feeder.news-service.com!newsfeed.xs4all.nl!newsfeed6.news.xs4all.nl!xs4all!post.news.xs4all.nl!not-for-mail
Return-Path: <prvs=091849e4b=jeanmichel@sequans.com>
X-Original-To: python-list@python.org
Delivered-To: python-list@mail.python.org
X-Spam-Status: OK 0.018
X-Spam-Evidence: '*H*': 0.96; '*S*': 0.00; 'decent': 0.07; 'merging': 0.09; 'subject:tools': 0.09; 'wrote:': 0.14; 'i.e': 0.16; 'really?': 0.16; 'received:192.168.200': 0.16; 'writes:': 0.20; 'cc:no real name:2**0': 0.20; 'cc:2**0': 0.20; 'header:In-Reply- To:1': 0.22; 'cc:addr:python-list': 0.22; 'issue.': 0.22; 'conflicts': 0.23; 'changes': 0.29; 'forgot': 0.29; 'cc:addr:python.org': 0.31; 'edited': 0.31; 'separately': 0.31; 'solved': 0.31; 'received:192': 0.34; 'there': 0.35; 'header:User- Agent:1': 0.35; 'doing': 0.36; 'received:192.168': 0.37; 'resulting': 0.38; 'user': 0.38; 'computer.': 0.38; 'files': 0.38; 'would': 0.40; 'computers': 0.64; 'subject:Development': 0.73; 'occasion': 0.84
X-IronPort-AV: E=Sophos;i="4.64,274,1301868000"; d="scan'208";a="1395275"
X-Virus-Scanned: amavisd-new at zimbra.sequans.com
Date: Wed, 27 Apr 2011 14:24:30 +0200
From: Jean-Michel Pichavant <jeanmichel@sequans.com>
User-Agent: Mozilla-Thunderbird 2.0.0.24 (X11/20100328)
MIME-Version: 1.0
To: Anssi Saari <as@sci.fi>
Subject: Re: Development tools and practices for Pythonistas
References: <58a6bb1b-a98e-4c4a-86ea-09e040cb2d21@r35g2000prj.googlegroups.com>	<mailman.869.1303848895.9059.python-list@python.org>	<877hagoa0u.fsf@benfinney.id.au>	<mailman.890.1303896280.9059.python-list@python.org> <vg37hafevto.fsf@pepper.modeemi.fi>
In-Reply-To: <vg37hafevto.fsf@pepper.modeemi.fi>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: python-list@python.org
X-BeenThere: python-list@python.org
X-Mailman-Version: 2.1.12
Precedence: list
List-Id: General discussion list for the Python programming language <python-list.python.org>
List-Unsubscribe: <http://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: <http://mail.python.org/mailman/listinfo/python-list>, <mailto:python-list-request@python.org?subject=subscribe>
Newsgroups: comp.lang.python
Message-ID: <mailman.893.1303907075.9059.python-list@python.org>
Lines: 17
NNTP-Posting-Host: 82.94.164.166
X-Trace: 1303907075 news.xs4all.nl 32470 [::ffff:82.94.164.166]:39770
X-Complaints-To: abuse@xs4all.nl
Xref: x330-a1.tempe.blueboxinc.net comp.lang.python:4130

Anssi Saari wrote:
> Jean-Michel Pichavant <jeanmichel@sequans.com> writes:
>
>   
>> For a single user, there would be no merge issue.
>>     
>
> Really? What about a single user with many computers and environments?
> I find myself merging files on occasion because I edited them
> separately and forgot to check in changes before doing more edits on a
> different computer.
>   
I was talking about merge *issue* i.e merge resulting in conflicts that 
are not easy to solve. With a single user most of the merge will be 
solved automatically by any decent VCS.

JM