Erm, bump? Any joy for those of us still running perfectly serviceable
antiques?

On May 24, 11:01 pm, ed <[email protected]> wrote:
> git reset --hard 017492ef^
> followed by
> ./acprep opt make -- -prefix=/usr/local
>
> Outcome was the same:
>
> acprep: ERROR: Execution failed: sh configure CPPFLAGS=-isystem /usr/
> local/include -isystem /usr/local/include CFLAGS=-fast -arch i386 -
> arch x86_64 CXXFLAGS=-fpch-deps -Wconversion -fast -arch i386 -arch
> x86_64 -pipe LDFLAGS=-fast -arch i386 -arch x86_64 -L/usr/local/lib -L/
> usr/lib --with-included-gettext --enable-python --disable-dependency-
> tracking
>
> I could do a fresh checkout if that might help.
>
> On May 20, 10:12 pm, John Wiegley <[email protected]> wrote:
>
> > Then try git reset --hard 017492ef^ instead.
>
> > John
>
> > On May 20, 2010, at 8:51 AM, ed wrote:
>
> > > ledger ed$   git revert 017492ef
> > > fatal: Commit 017492ef5e80003073c5d053252d4a68a44260ae is a merge but
> > > no -m option was given.
>
> > > Sorry, I'm barely literate in git
>
> > > On May 19, 11:03 am, John Wiegley <[email protected]> wrote:
> > >> On May 19, 2010, at 4:08 AM, ed wrote:
>
> > >>> Yes with yesterday's update, I tend to update ledger on this machine
> > >>> most days
>
> > >> Assuming you use git, try this:
>
> > >>   git revert 017492ef
> > >>   ./acprep opt make -- -prefix=/usr/local
>
> > >> If that works, I know what the problem is.
>
> > >> To undo this change, use:
>
> > >>   git reset --hard origin/master    (or origin/next, if you track the 
> > >> next branch)
>
> > >> John
>
>

Reply via email to