Re: [PATCH 00/17] Narrow clone v3 (was subtree clone)

From: Elijah Newren <newren@gmail.com>
Date: Sep 6, 2010, 20:40 UTC
Message-ID: <AANLkTimaY6MmS8N+UHt43FCKh5v_hhWzWoRzdy_dPvOr@mail.gmail.com>
In-Reply-To: <AANLkTin3VykgwJyMaVNmDnjAU3_pkA0+cKn-GO0OSnBN@mail.gmail.com>

2010/9/6 Sverre Rabbelier <srabbelier@gmail.com>:

Show 11 quoted lines

> Heya,
>
> 2010/9/6 Elijah Newren <newren@gmail.com>:
>> So, I downloaded your patches and even made sure to sort them
>> appropriately to fix the order, but I'm getting conflicts trying to
>> apply them (on top of current pu).  What version did you base them on?
>
> It's considered best practice to base your patches on master if
> possible. You should only base them on next if you rely on a
> particular series that has already landed there. You should never base
> your patches on pu itself, on a topic in pu perhaps, but never on pu.

Ah, thanks for the reminder. I probably should have mentioned that I tried master and next too and had similar conflicts (I believe from some of AEvar's testing changes in master modifying the makefile in nearby locations, among other things). But in any event, I'm in good shape now.

I might have been able to make progress too, if I weren't being distracted from sparse clones by this rename+D/F conflict problem (though I think I've got it licked now...)

Elijah