See the mismerge: image.py: 2015: fields = line.split() -> fields = line.split(None, 3)
Will fix and commit after running the tests to make sure there are no other issues. JR Danek Duvall wrote: > On Mon, Nov 03, 2008 at 10:42:37AM +0000, jmr wrote: > > >> Danek Duvall wrote: >> >>> On Sun, Nov 02, 2008 at 09:45:41AM +0000, jmr wrote: >>> >>> >>> >>>> Webrev: http://cr.opensolaris.org/~jmr/pm_4126_v10_Nov01 >>>> >>>> >>> client.py: >>> >>> - line 2025: bad merge? This is reverting changeset 644. The line >>> number is off, too, so it looks like you'll need to remerge. Be >>> careful. >>> >>> >> Danek - this is puzzling. >> > > Indeed it would be. That's image.py. D'Oh. > > Danek > _______________________________________________ pkg-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
