From: Paul Eggert <eggert@cs.ucla.edu>
To: esr@thyrsus.com
Cc: emacs-devel@gnu.org
Subject: Re: Converted git repository available for review
Date: Sat, 22 Mar 2014 07:56:59 -0700 [thread overview]
Message-ID: <532DA4BB.9070301@cs.ucla.edu> (raw)
In-Reply-To: <20140322042921.GA29817@thyrsus.com>
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.
next prev parent reply other threads:[~2014-03-22 14:56 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-21 20:00 Converted git repository available for review Eric S. Raymond
2014-03-21 22:00 ` Stefan
2014-03-21 22:12 ` Eric S. Raymond
2014-03-21 22:06 ` Juanma Barranquero
2014-03-22 1:00 ` Paul Eggert
2014-03-22 3:00 ` Eric S. Raymond
2014-03-22 3:37 ` Paul Eggert
2014-03-22 3:42 ` Juanma Barranquero
2014-03-22 4:29 ` Eric S. Raymond
2014-03-22 14:56 ` Paul Eggert [this message]
2014-03-22 18:47 ` Eric S. Raymond
2014-03-24 9:24 ` .gitignore and .bzrignore files Nicolas Richard
2014-03-24 10:38 ` Eric S. Raymond
2014-03-24 11:53 ` Stephen J. Turnbull
2014-03-24 15:54 ` Nicolas Richard
2014-03-24 22:44 ` Achim Gratz
2014-03-22 4:41 ` Converted git repository available for review Juanma Barranquero
2014-03-22 7:32 ` Stephen J. Turnbull
2014-03-22 7:38 ` David Kastrup
2014-03-22 7:35 ` Eli Zaretskii
2014-03-22 11:48 ` Juanma Barranquero
2014-03-22 9:12 ` Eric S. Raymond
2014-03-22 11:47 ` Juanma Barranquero
2014-03-22 9:40 ` Andreas Schwab
2014-03-22 8:02 ` Andreas Schwab
2014-03-22 9:20 ` Eric S. Raymond
2014-03-22 9:44 ` Andreas Schwab
2014-03-22 11:03 ` Eric S. Raymond
2014-03-24 22:33 ` James Cloos
2014-03-24 22:39 ` Eric S. Raymond
2014-03-25 7:57 ` David Kastrup
2014-03-25 10:54 ` Eric S. Raymond
2014-03-25 11:04 ` David Kastrup
2014-03-25 11:32 ` Eric S. Raymond
2014-03-25 11:39 ` David Kastrup
2014-03-25 11:50 ` Eric S. Raymond
2014-03-25 12:47 ` Phillip Lord
2014-03-25 13:04 ` David Kastrup
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=532DA4BB.9070301@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=esr@thyrsus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).