Received: from spf3.us4.outblaze.com (spf3.us4.outblaze.com [205.158.62.25]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id j0O5G7PA023428 for ; Mon, 24 Jan 2005 05:16:07 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf3.us4.outblaze.com (Postfix) with ESMTP id 6287C53658 for ; Mon, 24 Jan 2005 05:16:37 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Cswmm-0005VC-NY for migo@homemail.com; Mon, 24 Jan 2005 00:29:12 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Cswkt-0004ui-QV for gnu-arch-users@gnu.org; Mon, 24 Jan 2005 00:27:17 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Cswkc-0004lU-UP for gnu-arch-users@gnu.org; Mon, 24 Jan 2005 00:26:59 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Cswkc-0004l0-QD for gnu-arch-users@gnu.org; Mon, 24 Jan 2005 00:26:58 -0500 Received: from [144.140.71.12] (helo=gizmo02ps.bigpond.com) by monty-python.gnu.org with smtp (Exim 4.34) id 1CswVk-000807-E3 for gnu-arch-users@gnu.org; Mon, 24 Jan 2005 00:11:37 -0500 Received: (qmail 1340 invoked from network); 24 Jan 2005 05:11:25 -0000 Received: from unknown (HELO psmam11.bigpond.com) (144.135.25.100) by gizmo02ps.bigpond.com with SMTP; 24 Jan 2005 05:11:25 -0000 Received: from cpe-144-132-221-212.nsw.bigpond.net.au ([144.132.221.212]) by psmam11.bigpond.com(MAM REL_3_4_2a 225/53213493) with SMTP id 53213493; Mon, 24 Jan 2005 15:11:25 +1000 Received: by whiskas.PoolCompsOnline.com (Postfix, from userid 1000) id 84BEB79F6E; Mon, 24 Jan 2005 16:11:25 +1100 Subject: Re: [Gnu-arch-users] Bazaar 1.1 From: Zenaan Harkness To: Robert Collins In-Reply-To: <1106125554.26756.4.camel@localhost> References: <1106125554.26756.4.camel@localhost> Content-Type: text/plain Content-Transfer-Encoding: 7bit Date: Mon, 24 Jan 2005 16:11:25 +1100 Message-Id: <1106543485.29796.129.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.0.3 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: , 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: 927 Lines: 31 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. Any doc pointers for more info on this one? > * 'delta --diffs' shows new file contents. I use this in a script: tla changes --diffs | vim -R -c 'source $VIMRUNTIME/syntax/diff.vim' \ -n - And it has always (I thought) shown me the contents of "tla add"ed files - the diff comparing with /dev/null. Is there something I'm not understanding here? tia zen _______________________________________________ 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/