From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel,gmane.comp.version-control.bazaar-ng.general Subject: Re: Emacs Bazaar repository Date: Fri, 14 Mar 2008 15:15:17 -0400 Message-ID: References: <87skyvse7k.fsf@xmission.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1205522138 17752 80.91.229.12 (14 Mar 2008 19:15:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Mar 2008 19:15:38 +0000 (UTC) Cc: bazaar@lists.canonical.com, Jason Earl , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 14 20:16:05 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JaFNo-00047C-5Q for ged-emacs-devel@m.gmane.org; Fri, 14 Mar 2008 20:16:00 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JaFNE-0000e4-Uo for ged-emacs-devel@m.gmane.org; Fri, 14 Mar 2008 15:15:24 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JaFNA-0000dW-J5 for emacs-devel@gnu.org; Fri, 14 Mar 2008 15:15:20 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JaFN9-0000cP-1I for emacs-devel@gnu.org; Fri, 14 Mar 2008 15:15:20 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JaFN8-0000cM-Oc for emacs-devel@gnu.org; Fri, 14 Mar 2008 15:15:18 -0400 Original-Received: from ironport2-out.pppoe.ca ([206.248.154.182]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JaFN8-0000KM-PW for emacs-devel@gnu.org; Fri, 14 Mar 2008 15:15:18 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApoEABtr2kdMCrZs/2dsb2JhbACqPYEI X-IronPort-AV: E=Sophos;i="4.25,502,1199682000"; d="scan'208";a="16067900" Original-Received: from smtp.pppoe.ca ([65.39.196.238]) by ironport2-out.pppoe.ca with ESMTP; 14 Mar 2008 15:15:18 -0400 Original-Received: from pastel.home ([76.10.182.108]) by smtp.pppoe.ca (Internet Mail Server v1.0) with ESMTP id UWD09218; Fri, 14 Mar 2008 15:15:18 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id C7D3E8F43; Fri, 14 Mar 2008 15:15:17 -0400 (EDT) In-Reply-To: (Andreas Schwab's message of "Fri, 14 Mar 2008 19:51:30 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:92604 gmane.comp.version-control.bazaar-ng.general:38608 Archived-At: >> How can we add the merge info into the above Bzr tree? > Probably the easiest way is by starting from > . I have spend quite some time to add > merge commits to this tree or updating the automatically created ones to > make them most useful. I have also corrected a few mistakes that crept > in due to shortcomings of cvsps or misuses of cvs. > It should be possible to losslessly convert this tree to whatever VCS we > end up using. Is this git tree "better" than the one in git.sv.gnu.org? If so, can someone update the one in git.sv.gnu.org to include the improvements that are in http://repo.or.cz/w/emacs.git. Even if we end up using this tree to generate the initial Bzr tree, I'd be interested to know who to add merge info to a Bzr repository. Stefan