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!postnews.google.com!k70g2000cwa.googlegroups.com!not-for-mail
From: njs@pobox.com
Newsgroups: comp.lang.ada
Subject: Re: ANNOUNCE: Debian build scripts on a public Monotone server
Date: 4 Oct 2006 13:42:24 -0700
Organization: http://groups.google.com
Message-ID: <1159994544.336977.122140@k70g2000cwa.googlegroups.com>
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>
NNTP-Posting-Host: 66.159.194.130
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
X-Trace: posting.google.com 1159994549 2037 127.0.0.1 (4 Oct 2006 20:42:29
 GMT)
X-Complaints-To: groups-abuse@google.com
NNTP-Posting-Date: Wed, 4 Oct 2006 20:42:29 +0000 (UTC)
User-Agent: G2/1.0
X-HTTP-UserAgent: Mozilla/5.0 (X11; U; Linux i686; en-US;
 rv:1.8.0.4) Gecko/20060406 Firefox/1.5.0.4
 (Debian-1.5.dfsg+1.5.0.4-1),gzip(gfe),gzip(gfe)
Complaints-To: groups-abuse@google.com
Injection-Info: k70g2000cwa.googlegroups.com; posting-host=66.159.194.130;
   posting-account=KBzYMg0AAADyIBsProrIrDf2NIzhUvb8
Xref: g2news2.google.com comp.lang.ada:6870
Date: 2006-10-04T13:42:24-07:00
List-Id: <comp.lang.ada>

Samuel Tardieu wrote:
> >>>>> "Nathaniel" == njs  <njs@pobox.com> writes:
>
> Brian> Just curious: Is it possible to somehow terminate a dead tree head
> Brian> without merging it?
>
> Nathaniel> You could merge it, and override the merge algorithm to say
> Nathaniel> "resolve all conflicts in my favor".  Basically you end up
> Nathaniel> with a revision graph that looks like:
>
> A modified file in the dead branch only wouldn't result in a
> conflict. Would those modified files be changed anyway during this
> kind of merge?

[Sorry for missing this until now.]

In the UI I am thinking of, yes.

Create an on-disk directory tree matching GOODREV:
  $ mtn checkout -r GOODREV my-workspace; cd my-workspace
Merge in the revision I want to kill.  After this, my directory tree
contains a mix of edits from both sides, some conflicts, whatever, and
has both GOODREV and BADREV as parents:
  $ mtn merge -r BADREV
Throw away all local changes, to make my local directory tree exactly
match that seen in GOODREV (but this only effects directory contents,
it doesn't affect the parent links):
  $ mtn revert -r GOODREV
Commit my new tree, with its two parents:
  $ mtn commit --message="Clobbered BADREV"

You could do something else at any step, of course -- this is just
composing primitives.

-- Nathaniel