Received: from spf1.us4.outblaze.com (spf1.us4.outblaze.com [205.158.62.23]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id j0T2IBA7003973 for ; Sat, 29 Jan 2005 02:18:11 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf1.us4.outblaze.com (Postfix) with ESMTP id F13A9298569 for ; Sat, 29 Jan 2005 02:18:47 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1CuiOh-0003I8-2U for migo@homemail.com; Fri, 28 Jan 2005 21:31:39 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1CuiNl-0003Fd-EE for gnu-arch-users@gnu.org; Fri, 28 Jan 2005 21:30:41 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1CuiNc-0003BX-P7 for gnu-arch-users@gnu.org; Fri, 28 Jan 2005 21:30:35 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1CuiNb-00035R-SH for gnu-arch-users@gnu.org; Fri, 28 Jan 2005 21:30:31 -0500 Received: from [203.22.251.251] (helo=mg2.works.net.au) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1CuhkY-0007AU-Dk for gnu-arch-users@gnu.org; Fri, 28 Jan 2005 20:50:11 -0500 Received: from aardvark.ozdial.net.au (aardvark.ozdial.net.au [203.22.251.121]) by mg2.works.net.au (8.12.11/linuxconf) with ESMTP id j0T1o2tm000410; Sat, 29 Jan 2005 12:50:02 +1100 Received: from lifelesswks.robertcollins.net (dsl-149.7.240.220.rns01-kent-syd.dsl.comindico.com.au [220.240.7.149]) by aardvark.ozdial.net.au (8.12.8/linuxconf) with ESMTP id j0T1o0oG003260; Sat, 29 Jan 2005 12:50:02 +1100 Received: from [3ffe:8002:1004:0:20e:35ff:fe07:eee9] (helo=lifelesslap.robertcollins.net ident=Debian-exim) by lifelesswks.robertcollins.net with asmtp (Exim 4.34) id 1CuhkN-00087P-T3; Sat, 29 Jan 2005 12:49:59 +1100 Received: from localhost ([127.0.0.1] ident=robertc) by lifelesslap.robertcollins.net with esmtp (Exim 4.34) id 1Cuhjp-0006PI-01; Sat, 29 Jan 2005 12:49:25 +1100 Subject: Re: [Gnu-arch-users] Bazaar 1.1 From: Robert Collins To: Zenaan Harkness In-Reply-To: <1106543485.29796.129.camel@localhost.localdomain> References: <1106125554.26756.4.camel@localhost> <1106543485.29796.129.camel@localhost.localdomain> Date: Sat, 29 Jan 2005 12:49:24 +1100 Message-Id: <1106963364.825.30.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.1.3.2 X-MG2-Works-MailScanner-Information: Please contact the ISP for more information X-MG2-Works-MailScanner: Found to be clean X-MG2-Works-MailScanner-SpamCheck: not spam, SpamAssassin (score=-4.285, required 5, BAYES_00 -4.90, RCVD_IN_NJABL_DUL 0.53, RCVD_IN_SORBS_DUL 0.09) X-MailScanner-From: rbcollins@cygwin.com Cc: Arch Users X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0273344043==" Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 1598 Lines: 60 --===============0273344043== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-oNY/7+LWoEgpLbmA1tUE" --=-oNY/7+LWoEgpLbmA1tUE Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Mon, 2005-01-24 at 16:11 +1100, Zenaan Harkness wrote: > On Wed, 2005-01-19 at 20:05 +1100, Robert Collins wrote: > > * 'merge' replaces 'star-merge'. merge uses ancestry data to find > > merge points outside of the current arch namespace. This > > removes the need to use join-branch. If star-merge behaviour is > > desired, it can be obtained by 'merge --star-merge'. > > Merge also uses three-way by default. >=20 > Any doc pointers for more info on this one? Not really at this point. Its the same three way algorithm that star-merge -t enables.=20 Cheers, Rob --=-oNY/7+LWoEgpLbmA1tUE Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (GNU/Linux) iD8DBQBB+uukM4BfeEKYx2ERAh3TAJ9Ea5UjZQBByZqzFjCdTvh8g5uNsgCfT2SB 5c4vWj8LeNJF2Kojkg3Dmdg= =w+ox -----END PGP SIGNATURE----- --=-oNY/7+LWoEgpLbmA1tUE-- --===============0273344043== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/ --===============0273344043==--