From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Converted git repository available for review Date: Sat, 22 Mar 2014 07:56:59 -0700 Organization: UCLA Computer Science Department Message-ID: <532DA4BB.9070301@cs.ucla.edu> References: <20140321200042.236863805FB@snark.thyrsus.com> <532CE0B7.3010309@cs.ucla.edu> <20140322030017.GA29313@thyrsus.com> <532D057D.9050305@cs.ucla.edu> <20140322042921.GA29817@thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1395500232 14945 80.91.229.3 (22 Mar 2014 14:57:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Mar 2014 14:57:12 +0000 (UTC) Cc: emacs-devel@gnu.org To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 22 15:57:21 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WRNMM-0005B5-SX for ged-emacs-devel@m.gmane.org; Sat, 22 Mar 2014 15:57:18 +0100 Original-Received: from localhost ([::1]:57249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WRNMM-0001Zb-Ic for ged-emacs-devel@m.gmane.org; Sat, 22 Mar 2014 10:57:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WRNMC-0001ZS-EP for emacs-devel@gnu.org; Sat, 22 Mar 2014 10:57:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WRNM5-00008Y-48 for emacs-devel@gnu.org; Sat, 22 Mar 2014 10:57:08 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:51680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WRNM4-00008U-Sg for emacs-devel@gnu.org; Sat, 22 Mar 2014 10:57:01 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id F365739E8017; Sat, 22 Mar 2014 07:56:59 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8nMyNBXVHp1m; Sat, 22 Mar 2014 07:56:59 -0700 (PDT) Original-Received: from [192.168.1.9] (pool-108-0-233-62.lsanca.fios.verizon.net [108.0.233.62]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 7A46E39E8012; Sat, 22 Mar 2014 07:56:59 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 In-Reply-To: <20140322042921.GA29817@thyrsus.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170801 Archived-At: Eric S. Raymond wrote: > The arch tag you're seeing must have been removed in .gitigores but not > in .bzrignores. Other than the (trivial) bar-to-git syntax change > I'm not messing with the data or trying to do anything clever. There are no arch tags in the trunk now, in either .gitignore or .bzrignore files. So something must have gone wrong in the lift. > The issue is what to do when a revision has both .bzrignores and > .gitignores. The pfresent policy is to treat each .bzrignore with > a matching.gitignore as authoritative; that is, the .bzrignore > is translated and overwites the .gitignore. The bzr trunk has just one .bzrignore, at the root; it also has one .gitignore at the root and 12 other .gitignore files scattered all over the place. (I don't know why.) From what you say, the git review1 should have the same pattern of files, with the old root .gitignore replaced by the translated .bzrignore (though I don't know why we should keep the .bzrignore -- shouldn't it be removed?). However, the git review1 has 38 .gitignore files (counting the one at the root). Where did they come from? Plus, the git review1 is missing some .gitignore files that are in the trunk, namely lisp/cedet/.gitignore, lisp/leim/.gitignore, lisp/leim/quail/.gitignore. Why is that happening? Perhaps rather than delve into this too much, how about a different idea. Currently people are using both bzr and git to access Emacs repositories, so they've tuned the .bzrignore and .gitignore files to match what they want from the different repository backends. So why not leave these files alone? When we switch from bzr+git to just git, we can remove the .bzrignore file. This would be simpler than rewriting history, would be easier for everybody to understand, and would be less likely to go wrong.