2008-03-19 19:43:31

by Eric Sandeen

Subject: e2fsprogs/pu has a conflict checked in

http://git.kernel.org/?p=fs/ext2/e2fsprogs.git;a=blob;f=lib/ext2fs/Makefile.in;h=1f5effa42d0f9c69458941bd75cde82940197a2f;hb=pu#l659

doesn't really build well that way ;)

-Eric

2008-03-19 19:26:03

by Theodore Ts'o

Subject: Re: e2fsprogs/pu has a conflict checked in

On Wed, Mar 19, 2008 at 10:23:28AM -0500, Eric Sandeen wrote:
> http://git.kernel.org/?p=fs/ext2/e2fsprogs.git;a=blob;f=lib/ext2fs/Makefile.in;h=1f5effa42d0f9c69458941bd75cde82940197a2f;hb=pu#l659
>
> doesn't really build well that way ;)

Oops. thanks for pointing that out. Fortunately it's only on the pu
branch...

- Ted

2008-03-20 20:22:13

by Theodore Ts'o

Subject: Re: e2fsprogs/pu has a conflict checked in

On Wed, Mar 19, 2008 at 12:10:59PM -0400, Theodore Tso wrote:
> On Wed, Mar 19, 2008 at 10:23:28AM -0500, Eric Sandeen wrote:
> > http://git.kernel.org/?p=fs/ext2/e2fsprogs.git;a=blob;f=lib/ext2fs/Makefile.in;h=1f5effa42d0f9c69458941bd75cde82940197a2f;hb=pu#l659
> >
> > doesn't really build well that way ;)
>
> Oops. thanks for pointing that out. Fortunately it's only on the pu
> branch...

Fixed now.

- Ted