From: Nguyen Thai Ngoc Duy Date: Tue, 24 Aug 2010 22:47:31 GMT Subject: Re: [RFD PATCH 00/32] subtree clone v2 Message-ID: In-Reply-To: <20100824223741.GB2376@burratino> On Wed, Aug 25, 2010 at 8:37 AM, Jonathan Nieder wrote: > Nguyễn Thái Ngọc Duy wrote: > >> Patches 26..30 >>   Add upload-narrow-base command >>   rev-list: traverse some more trees to make upload-narrow-base happy >>   narrow-tree: add oldest_narrow_base() >>   Add command fetch-narrow-base >>   merge: support merging when narrow bases are different >> >> Remote merge part. >> >> Split a merge operation into two parts, the real merge will be done >> within narrow tree. Conflicts can happen and be resolved in the narrow >> index, locally. >> >> Everything outside narrow tree will be merged (trivially) by >> server. Then server sends the base tree back, so join_narrow_tree() in >> patch 20 can be used to create proper commit. >> >> Server can disable this remote merge feature, which means users are >> forced to do rebase/fast-forward. Not too bad. > > Yikes.  Naïve question (please forgive my laziness): is it possible to > merge without remote contact in the boring case, when no changes have > occured outside the narrow tree? That's possible (and is implemented in my series). But I guess as soon as you do "git pull", the boring case is likely not applicable anymore. -- Duy