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
From: Brian May <bam@snoopy.apana.org.au>
Newsgroups: comp.lang.ada
Subject: Re: ANNOUNCE: Debian build scripts on a public Monotone server
References: <871wpzd7js.fsf@ludovic-brenta.org>
	<1159259938.13504.19.camel@localhost>
	<1159263129.848672.286190@m7g2000cwm.googlegroups.com>
	<1159267398.13504.35.camel@localhost>
	<1159433540.824912.193400@i3g2000cwc.googlegroups.com>
	<sa4irj7w91x.fsf@margay.local>
	<1159574582.667087.127500@i3g2000cwc.googlegroups.com>
	<87r6xtmvc8.fsf@willow.rfc1149.net>
	<1159994544.336977.122140@k70g2000cwa.googlegroups.com>
Date: Fri, 06 Oct 2006 16:12:12 +1000
Message-ID: <sa4lknu2csj.fsf@margay.local>
User-Agent: Gnus/5.110006 (No Gnus v0.6) XEmacs/21.4.19 (linux)
Cancel-Lock: sha1:aqew0ZxBOT4vQmHlMtJiKhln9TQ=
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
NNTP-Posting-Host: snoopy.microcomaustralia.com.au
X-Trace: quokka.wn.com.au 1160115131 202.173.153.89 (6 Oct 2006 14:12:11
 +0800)
X-Complaints-To: abuse@westnet.com.au
Path: 
 g2news2.google.com!news3.google.com!news.glorb.com!quokka.wn.com.au!not-for-mail
Xref: g2news2.google.com comp.lang.ada:6888
Date: 2006-10-06T16:12:12+10:00
List-Id: <comp.lang.ada>


    njs> $ mtn checkout -r GOODREV my-workspace; cd my-workspace
    njs> Merge in the revision I want to kill.  After this, my directory tree
    njs> contains a mix of edits from both sides, some conflicts, whatever, and
    njs> has both GOODREV and BADREV as parents:
    njs> $ mtn merge -r BADREV

My (test) usage of merge so far as resulted in the result being
automatically committed. Is the above usage different?

Which brings me to a dislike of monotone, so often I see changelog messages like:

merge of '646c7d2cca0e8dd0e97e0d8f3cc73e5a3d39ab8d'
     and '87c207f4bee6cecb68e9bcc9c65c37a93c99934c'

Unfortunately, this doesn't tell me anything.

A manual description would be better, for example:

Merge in bug fix for XYZ into main tree.

I believe the parents are already mentioned in the revision anyway.

I have tried to register with the BTS
https://savannah.nongnu.org/account/register.php, so I can send bug
reports, however, so far all I get is errors. Is it possible to check
if I have already registered?


    njs> Throw away all local changes, to make my local directory tree exactly
    njs> match that seen in GOODREV (but this only effects directory contents,
    njs> it doesn't affect the parent links):
    njs> $ mtn revert -r GOODREV

Have to keep that command in mind - was wondering about it.

    njs> Commit my new tree, with its two parents:
    njs> $ mtn commit --message="Clobbered BADREV"

Looks good.
-- 
Brian May <bam@snoopy.apana.org.au>