Re: [TopGit PATCH] t/depend-add-using-export

[Bert Wesarg <bert.wesarg@googlemail.com>]

[ Just bringing back all Cc's ]

On Sat, Oct 9, 2010 at 14:10, Olaf Dabrunz <Olaf@dabrunz.com> wrote:
> On 09-Oct-10, Bert Wesarg wrote:
>> On Sat, Oct 9, 2010 at 12:54, Olaf Dabrunz <Olaf.Dabrunz@gmx.net> wrote:
>> > [...]
>>
>> When I understand this correctly, this hand made merge commit on base,
>> has also the just removed dep as parent. But the tree does not include
>
> The hand made merge commit on base only has a removed dep as a parent if
> that removed dep is brought in again directly, as the new dep that is
> added here. The only parents of the hand made merge commit are: the tip
> of the current topgit branch's base and the new dependency.
>
>    hand made merge commit on base =                        \
>        git-commit-tree $tree_from_merge_on_export          \
>                        -p $topgit_base_branch -p $new_dep
>
> In general, the new dep may already have merged in a dep that we
> previously removed from our topgit branch. So the previously removed dep
> is brought in indirectly by merging a branch that contains it.
>
> This patch tries to cover both cases. The latter case and requirements
> for tg depend add to cover it were discussed by you and Uwe in this
> thread:
>
> http://lists-archives.org/git/688698-add-list-and-rm-sub-commands-to-tg-depend.html
>
>> any code from that dep. So git merge-base would select this commit as
>
> If the new dep _is_ a previously removed dep, the code of the new dep is
> contained in the hand made merge as well.
>
> If the new dep _brings in_ a previously removed dep, it depends on how
> the previously removed dep was merged into the new dep we are trying to
> merge now. If our new dep merged in the previously removed dep but used
> the "ours" merge strategy to supersede that dep's contents, it does not
> bring in any code from that dep but only brings in that dep as part of
> it's history.
>
>> the merge base.
>
> Yes, as the previously removed dep is now -- directly or indirectly --
> part of the history of the hand made merge on base.
>
> I should really draw graphs. But here is the mail anyway (release
> early...).
>
> Olaf
>
> --
> Olaf Dabrunz (Olaf <at> dabrunz.com)
>
>