Re: What's cooking in git/spearce.git (Sep 2008, #04; Mon, 22)

From: Shawn O. Pearce <spearce@spearce.org>
Date: Sep 30, 2008, 18:28 UTC
Message-ID: <20080930182840.GD21310@spearce.org>
In-Reply-To: <81b0412b0809300545m7bc39fb8v2a724c05141d8d37@mail.gmail.com>

Alex Riesen <raa.lkml@gmail.com> wrote:

Show 13 quoted lines

> 2008/9/30 Alex Riesen <raa.lkml@gmail.com>:
> > 2008/9/29 Shawn O. Pearce <spearce@spearce.org>:
> >> Here are the topics that have been cooking.  Commits prefixed
> >> with '-' are only in 'pu' while commits prefixed with '+' are
> >> in 'next'.
> >
> > Would you mind adding the remove_path factorization patches
> > in there somewhere?
> >
> > http://marc.info/?l=git&m=122246984212129&w=4
> > http://marc.info/?l=git&m=122246997012269&w=4
> 
> Oh, I see: they're in your master

Yea. They were trivial enough that I didn't see a reason to hold off on applying them. That section of code has been difficult to deal with merge conflicts on, due to all of the code moving around. Ironically enough, its the merge code itself that is ugly to merge... ;-)

-- 
Shawn.