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 Sender: sam@willow.rfc1149.net From: Samuel Tardieu 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> <1159574582.667087.127500@i3g2000cwc.googlegroups.com> Date: 30 Sep 2006 13:45:27 +0200 Message-ID: <87r6xtmvc8.fsf@willow.rfc1149.net> User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.4 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Leafnode-NNTP-Posting-Host: 2001:6f8:37a:2::2 Organization: Guest of ProXad - France NNTP-Posting-Date: 30 Sep 2006 13:50:03 MEST NNTP-Posting-Host: 88.191.14.223 X-Trace: 1159617003 nnrp2-1.free.fr 8609 88.191.14.223:53275 X-Complaints-To: abuse@proxad.net Path: g2news2.google.com!news4.google.com!news3.google.com!border1.nntp.dca.giganews.com!nntp.giganews.com!newsfeed00.sul.t-online.de!t-online.de!130.59.10.21.MISMATCH!kanaga.switch.ch!switch.ch!news.in2p3.fr!in2p3.fr!feed.ac-versailles.fr!proxad.net!cleanfeed2-b.proxad.net!nnrp2-1.free.fr!not-for-mail Xref: g2news2.google.com comp.lang.ada:6811 Date: 2006-09-30T13:50:03+02:00 List-Id: >>>>> "Nathaniel" == njs 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? Sam -- Samuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/