git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: David Symonds <dsymonds@gmail.com>
Cc: Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
	git mailing list <git@vger.kernel.org>
Subject: Re: on subtree checkout
Date: Tue, 26 Feb 2008 11:23:00 +0000 (GMT)	[thread overview]
Message-ID: <alpine.LSU.1.00.0802261119590.17164@racer.site> (raw)
In-Reply-To: <ee77f5c20802251830p47c6de60je97a31cb34bc3105@mail.gmail.com>

Hi,

On Mon, 25 Feb 2008, David Symonds wrote:

> On Mon, Feb 25, 2008 at 5:59 PM, Johannes Schindelin 
> <Johannes.Schindelin@gmx.de> wrote:
> >
> > But I agree with others that you should think about sane 
> > implementations of rebase/merge with partial checkouts.
> 
> I, too, was shortly going to attempt a partial checkout/clone 
> implementation. The intended context of my implementation was similar to 
> the KDE scenario in that you might only care about /pkgA and /pkgB, so 
> changes to /pkgC are usually irrelevant and independent to your 
> work-flow, so I was planning to assume a simplistic "theirs" merge 
> strategy for /pkgC, etc.

That might work for the people who have partial checkouts.  But I see a 
lot of problems looming there: just imagine a documenter rebased on top of 
'master', and _then_ on top of a branch by another documenter, which is 
newer with respect to documentation, but older with respect to the code.

It is _really_ easy to break code if you have no intention to test the 
result of a merge, _especially_ so when it is a "theirs" strategy.

Ciao,
Dscho

      reply	other threads:[~2008-02-26 11:24 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-24  9:34 on subtree checkout Nguyen Thai Ngoc Duy
2008-02-24  9:59 ` Robin Rosenberg
2008-02-24 10:23   ` Jakub Narebski
2008-02-24 10:53     ` Robin Rosenberg
2008-02-24 11:53       ` Jakub Narebski
2008-02-24 10:03 ` Jakub Narebski
2008-02-24 15:12   ` Nguyen Thai Ngoc Duy
2008-02-24 15:45     ` Jakub Narebski
2008-02-24 15:59       ` Matthieu Moy
2008-02-24 17:22         ` Robin Rosenberg
2008-02-26  1:59 ` Johannes Schindelin
2008-02-26  2:30   ` David Symonds
2008-02-26 11:23     ` Johannes Schindelin [this message]

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: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=alpine.LSU.1.00.0802261119590.17164@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=dsymonds@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=pclouds@gmail.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://80x24.org/mirrors/git.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).