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!news4.google.com!border1.nntp.dca.giganews.com!nntp.giganews.com!newsfeed00.sul.t-online.de!newsfeed01.sul.t-online.de!t-online.de!newsfeed01.chello.at!newsfeed02.chello.at!news.hispeed.ch.POSTED!not-for-mail Message-ID: <4604845.TbTKEgn9JJ@linux1.krischik.com> From: Martin Krischik Subject: Re: ANNOUNCE: Debian build scripts on a public Monotone server Newsgroups: comp.lang.ada Date: Sat, 30 Sep 2006 12:08:00 +0200 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> User-Agent: KNode/0.10.4 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7Bit X-Complaints-To: abuse@hispeed.ch Organization: hispeed.ch NNTP-Posting-Host: 84.74.130.70 (84.74.130.70) NNTP-Posting-Date: Sat, 30 Sep 2006 12:45:04 +0200 X-Trace: a3fa1451e4ab0f1ef27e303190 Xref: g2news2.google.com comp.lang.ada:6810 Date: 2006-09-30T12:08:00+02:00 List-Id: njs@pobox.com wrote: > You could merge it, and override the merge algorithm to say "resolve > all conflicts in my favor". Yet another feature which I was allways looking for. Not very often - but sometimes - I have a perfect version prepated in the working directory and then (for whatever reason) the vcs (falsely) thinks I need a merge. And then the trouble beginns... Martin -- mailto://krischik@users.sourceforge.net Ada programming at: http://ada.krischik.com