Re: Joining Repositories

From: Junio C Hamano <junkio@cox.net>
Date: Jan 19, 2006, 18:24 UTC
Message-ID: <7vlkxcdqjc.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060118141442.GP28365@pasky.or.cz>

Petr Baudis <pasky@suse.cz> writes:

Show 6 quoted lines

>   oops, it seems this is only in the latest pu branch of git. If you are
> not brave enough for that, you will need to use the prefix facility of
> checkout-index instead, and it'll take much longer:
>...
>   Note that I'm not sure when which feature was introduced. Your best
> bet is to just use the latest stable GIT/Cogito versions.

The "read-tree --prefix" and friends were only talked about during the "bind" commit discussion, and with some experimental code in "pu". Here is my thought on their readiness:

 - "read-tree --prefix=<prefix>/" may independently be useful
   even if we choose not to go "bind" commit approach.  However
   what it does when the index already has something at
   <prefix>/ has room for improvement.  I think it should have
   an option to do an equivalent of either one-way merge or
   two-way merge for that part of subtree.  Currently it always
   rejects if the current index has anything there.

 - "write-tree --prefix=<prefix>/" is redundant for the purpose
   of "bind" commit, because we would write the whole tree to be
   recorded in the enclosing project and it is easy to pick the
   subproject part with ls-tree from such a tree.  So it needs
   an independent advocate / rationale before graduating from
   "pu".

 - "write-tree --bound=<prefix>/ --bound=<prefix>/ ..." cannot
   be emulated by any other way and may be independently useful
   outside "bind" commit context.  Maybe the option should be
   renamed to --exclude=<prefix>/ or somesuch before going to
   "master".

 - "commit-tree --bind" should stay in "pu" until other pieces
   to correctly deal with commit objects with "bind" lines are
   ready, including fsck-objects and rev-list.  It _might_ be
   safer to bump the core.repositoryformatversion automatically
   once you have such a commit object in your repo.