Gnus development mailing list
 help / color / mirror / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Ted Zlatanov <tzz@lifelogs.com>
Cc: <emacs-devel@gnu.org>,  <ding@gnus.org>
Subject: Re: The Gnus repository is switching to Git as of 2010-04-19
Date: Tue, 20 Apr 2010 18:28:45 -0400	[thread overview]
Message-ID: <jwvhbn5rcix.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <878w8hevp6.fsf@lifelogs.com> (Ted Zlatanov's message of "Tue, 20 Apr 2010 15:05:25 -0500")

> Git doesn't really do renames, but "git diff" will detect them if the
> deleted and the new file have the same content.

I know that's how it works.  But I don't know what it means in terms of
the behavior when merging changes, including addition/removal of files.
IIUC it understands movement of files, but does it understand movement
of directories (e.g. if Gnus adds a new file lisp/gnus-new.el, will it
appear in Emacs as lisp/gnus/gnus-new.el or lisp/gnu-new.el?; similarly
if Emacs adds a new file lisp/new.el will it appear in Gnus as
lisp/new.el?).

I don't personally care whether the moves&removal&adds are done on the
Bzr or Git side.  AFAIK it's as easy to do it on either side.  It can
even be split into some part on one side and some other part on the
other side.

> A likely problem will be merging a specific Emacs branch bidirectionally
> to a specific Gnus branch.  So far I've only done it for Gnus trunk
> vs. Emacs trunk.

It should be just as easy for a branch as for the trunk.


        Stefan



  reply	other threads:[~2010-04-20 22:28 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-19 17:34 Ted Zlatanov
2010-04-19 18:21 ` Sivaram Neelakantan
2010-04-19 19:13   ` Ted Zlatanov
2010-04-21  8:50     ` Steinar Bang
2010-04-21  9:01       ` David Engster
2010-04-21  9:02         ` David Engster
2010-04-21 10:05       ` Andreas Schwab
2010-04-21 12:12         ` Andreas Schwab
2010-04-21 14:10           ` Ted Zlatanov
2010-04-21 14:54             ` Andreas Schwab
2010-04-23  0:55               ` Ted Zlatanov
2010-04-22  8:12           ` Steinar Bang
2010-04-19 19:17   ` Sven Joachim
2010-04-20 13:03 ` Harry Putnam
2010-04-20 13:29   ` Ted Zlatanov
2010-04-20 13:57   ` Andreas Schwab
     [not found] ` <jwvr5mb8evr.fsf-monnier+emacs@gnu.org>
2010-04-20 13:55   ` Ted Zlatanov
2010-04-20 15:00     ` Stefan Monnier
2010-04-20 20:05       ` Ted Zlatanov
2010-04-20 22:28         ` Stefan Monnier [this message]
2010-04-20 23:44           ` Ted Zlatanov
2010-04-21  3:16             ` Stefan Monnier
2010-04-21 11:03               ` Gnus Git synchronization with Emacs Bazaar (was: The Gnus repository is switching to Git as of 2010-04-19) Ted Zlatanov
2010-04-22  2:24                 ` Stephen J. Turnbull
2010-04-21  0:33           ` The Gnus repository is switching to Git as of 2010-04-19 Stephen J. Turnbull
2010-04-21  0:51             ` Ted Zlatanov
2010-04-21  3:31               ` Stephen J. Turnbull
2010-04-21  3:11             ` Stefan Monnier
2010-04-21  4:00               ` Stephen J. Turnbull
2010-04-21  9:01           ` Andreas Schwab
2010-04-21  2:59         ` Teemu Likonen
2010-04-21 11:30           ` Ævar Arnfjörð Bjarmason
2010-04-21 14:57             ` Teemu Likonen
2010-04-21 16:36               ` Ævar Arnfjörð Bjarmason
2010-04-23  1:09         ` cgit beautification (was: The Gnus repository is switching to Git as of 2010-04-19) Ted Zlatanov
2011-02-25 22:04           ` cgit beautification Ted Zlatanov
2011-02-25 22:56             ` Adam Sjøgren
2011-02-25 23:19             ` Adam Sjøgren
2011-02-26 12:05               ` Lars Ingebrigtsen
2011-03-01 10:27               ` Ted Zlatanov
2011-03-01 10:30                 ` Ted Zlatanov
2011-03-01 11:31                   ` Adam Sjøgren
2011-03-01 13:32                     ` Ted Zlatanov
2011-03-01 17:08                       ` Adam Sjøgren
2011-03-02 11:05                         ` Ted Zlatanov
2010-04-22  5:49     ` The Gnus repository is switching to Git as of 2010-04-19 Harry Putnam
2010-04-23  0:36       ` Ted Zlatanov

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=jwvhbn5rcix.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=ding@gnus.org \
    --cc=emacs-devel@gnu.org \
    --cc=tzz@lifelogs.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.
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 NNTP newsgroup(s).