Re: [RFD PATCH 00/32] subtree clone v2
- From
Nguyen Thai Ngoc Duy <pclouds@gmail.com>
- Date
- Aug 26, 2010, 04:45 UTC
- Message-ID
- <AANLkTinZk-cF6ksN2UhAyHNwJAS=fm6eLKJEP+evdJGU@mail.gmail.com>
- In-Reply-To
- <AANLkTinH8UWbkCUBFa1yr1fOQJgs9rLOj_kcp2UR3iua@mail.gmail.com>
On Thu, Aug 26, 2010 at 2:39 PM, Elijah Newren <newren@gmail.com> wrote:
Show 22 quoted lines
> On Wed, Aug 25, 2010 at 9:52 PM, Nguyen Thai Ngoc Duy <pclouds@gmail.com> wrote: >> Let's say in "ancestor" tree, we have >> >> t1/f0 >> t2/t3/f0 >> >> In "you" tree, we have >> >> t1/f0 >> t2/t3/f0 >> t2/t3/f1 >> >> In "upstream" tree, we have >> >> t1/f0 >> t2/t3/f0 >> t2/t3/f2 >> >> The narrow tree is t1, so we the trees we have are toplevel tree and > > How would you get the "you" tree? Since you don't have the data for > t2 or t2/t3, there's no way you can create and commit this tree.
"you" tree does not create that file. It's been there. It's the "ancestor" tree that did not have that file. So if you happen to choose an "upstream" tree that git-merge-base would give you that particular "ancestor" tree, we're in this situation.
-- Duy