On 06/05/2011 01:58 PM, H.J. Lu wrote:
On Sun, Jun 5, 2011 at 12:17 PM, H.J. Lu<hjl.to...@gmail.com> wrote:
Hi,
Your commit:
http://gcc.gnu.org/ml/gcc-cvs/2011-06/msg00145.html
includes some bogus entries:
trunk/gcc/go/gofrontend/expressions.cc.merge-left.r167407
trunk/gcc/go/gofrontend/expressions.cc.merge-right.r172891
trunk/gcc/go/gofrontend/expressions.cc.working
trunk/gcc/go/gofrontend/go.cc.merge-left.r167407
trunk/gcc/go/gofrontend/go.cc.merge-right.r172891
trunk/gcc/go/gofrontend/go.cc.working
trunk/gcc/go/gofrontend/gogo-tree.cc.merge-left.r167407
trunk/gcc/go/gofrontend/gogo-tree.cc.merge-right.r172891
trunk/gcc/go/gofrontend/gogo-tree.cc.working
trunk/gcc/go/gofrontend/gogo.cc.merge-left.r167407
trunk/gcc/go/gofrontend/gogo.cc.merge-right.r172891
trunk/gcc/go/gofrontend/gogo.cc.working
trunk/gcc/go/gofrontend/gogo.h.merge-left.r167407
trunk/gcc/go/gofrontend/gogo.h.merge-right.r172891
trunk/gcc/go/gofrontend/gogo.h.working
trunk/gcc/go/gofrontend/parse.cc.merge-left.r167407
trunk/gcc/go/gofrontend/parse.cc.merge-right.r172891
trunk/gcc/go/gofrontend/parse.cc.working
trunk/gcc/go/gofrontend/parse.h.merge-left.r167407
trunk/gcc/go/gofrontend/parse.h.merge-right.r172891
trunk/gcc/go/gofrontend/parse.h.working
trunk/gcc/go/gofrontend/statements.cc.merge-left.r167407
trunk/gcc/go/gofrontend/statements.cc.merge-right.r172891
trunk/gcc/go/gofrontend/statements.cc.working
trunk/gcc/go/gofrontend/statements.h.merge-left.r167407
trunk/gcc/go/gofrontend/statements.h.merge-right.r172891
trunk/gcc/go/gofrontend/statements.h.working
trunk/gcc/go/gofrontend/types.cc.merge-left.r167407
trunk/gcc/go/gofrontend/types.cc.merge-right.r172891
trunk/gcc/go/gofrontend/types.cc.working
trunk/gcc/go/gofrontend/unsafe.cc.merge-left.r167407
trunk/gcc/go/gofrontend/unsafe.cc.merge-right.r172891
trunk/gcc/go/gofrontend/unsafe.cc.working
Can you fix it?
I checked in this patch:
http://gcc.gnu.org/ml/gcc-cvs/2011-06/msg00150.html
to revert it.
OK thanks, I still see some local conflicts on libstd++ so i am going to
delete/clean the local tree and recheckout and see where we are.
Thanks,
Jerry
