From mboxrd@z Thu Jan  1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on polar.synack.me
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham
	autolearn_force=no version=3.4.4
X-Google-Thread: 103376,a326ac15995ef20e
X-Google-Attributes: gid103376,public
X-Google-Language: ENGLISH,ASCII-7-bit
Path: 
 g2news2.google.com!news3.google.com!border1.nntp.dca.giganews.com!nntp.giganews.com!wns13feed!worldnet.att.net!164.128.36.58!news.ip-plus.net!newsfeed.ip-plus.net!news.post.ch!not-for-mail
From: Martin Krischik <krischik@users.sourceforge.net>
Newsgroups: comp.lang.ada
Subject: Re: ANNOUNCE: Debian build scripts on a public Monotone server
Date: Wed, 27 Sep 2006 16:40:08 +0200
Organization: Swisscom IP+ (post doesn't reflect views of Swisscom)
Message-ID: <451a8d49$1@news.post.ch>
References: <871wpzd7js.fsf@ludovic-brenta.org>
 <4519647E.3020308@obry.net>	<sa4mz8lvr34.fsf@margay.local>
 <87zmclzbjf.fsf@ludovic-brenta.org>
NNTP-Posting-Host: 194.41.146.1
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Trace: atlas.ip-plus.net 1159368012 469 194.41.146.1 (27 Sep 2006 14:40:12
 GMT)
X-Complaints-To: abuse@ip-plus.net
NNTP-Posting-Date: Wed, 27 Sep 2006 14:40:12 +0000 (UTC)
User-Agent: Thunderbird 1.5.0.5 (Windows/20060719)
In-Reply-To: <87zmclzbjf.fsf@ludovic-brenta.org>
X-Original-NNTP-Posting-Host: w01iwt.pnet.ch
X-Original-Trace: 27 Sep 2006 16:40:09 +0200, w01iwt.pnet.ch
Xref: g2news2.google.com comp.lang.ada:6778
Date: 2006-09-27T16:40:08+02:00
List-Id: <comp.lang.ada>

Ludovic Brenta schrieb:

>> I find it interesting in Monotone you can commit changes even if your
>> tree is not up-to-date, so you only commit your changes first go, and
>> then you do the merge. As opposed to being forced to do both in the
>> one commit (I never liked this model).
> 
> That's funny because it took me a little while to get used to the
> "commit first, merge then" model.  I wasn't used to it.  Now I like it
> quite a lot.

That's exactly was I was always looking for. I just hate how most vcs 
force me to mess up my perfectly good code by forcing me to merge when I 
am not yet ready for merge. Worse: I won't have a backup copy of the 
pre-merge code.

Yes, those vcs will mess up my working copy with ".#" files - but that 
is not the same as having a backup inside the repository.

The other option I am often missing is a "golden code" option. What I 
have prepared inside the working copy is right and propper - no merge 
needed - thank you very much.

Martin