Re: Strange git commit on master branch in gcc git mirror

2011-06-06 Thread Tobias Burnus
On 06/06/2011 02:00 PM, jerry DeLisle wrote: This whole thing has me puzzled. The branch was created before go and libgo existed on trunk. Then I did a plain vanilla merge and got a whole bunch of tree conflicts just for those two directories. Then I attempted to manually resolve those tree co

Re: Strange git commit on master branch in gcc git mirror

2011-06-06 Thread jerry DeLisle
On 06/06/2011 04:40 AM, Richard Guenther wrote: On Mon, Jun 6, 2011 at 12:14 PM, Tobias Burnus wrote: On 06/06/2011 11:47 AM, Richard Guenther wrote: Looks like an accident, modifying both trunk and branches/fortran-dev. But the git mirror splits it between the trunk and fortran-dev branches.

Re: Strange git commit on master branch in gcc git mirror

2011-06-06 Thread Richard Guenther
On Mon, Jun 6, 2011 at 12:14 PM, Tobias Burnus wrote: > On 06/06/2011 11:47 AM, Richard Guenther wrote: >>> >>> Looks like an accident, modifying both trunk and branches/fortran-dev. >>> But the git mirror splits it between the trunk and fortran-dev branches. >> >> Jerry, can you fix it up please?

Re: Strange git commit on master branch in gcc git mirror

2011-06-06 Thread Tobias Burnus
On 06/06/2011 11:47 AM, Richard Guenther wrote: Looks like an accident, modifying both trunk and branches/fortran-dev. But the git mirror splits it between the trunk and fortran-dev branches. Jerry, can you fix it up please? This has been fixed else thread (cf. "Strange commit from fortran-de

Re: Strange git commit on master branch in gcc git mirror

2011-06-06 Thread Richard Guenther
On Sun, Jun 5, 2011 at 9:38 PM, Andreas Schwab wrote: > "H.J. Lu" writes: > >> http://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6681e82c16913119b6a3ca0052efe9259d7377a9 >> >>  in git mit mirror, which isn't in svn gcc trunk. > > It's right here: > > http://gcc.gnu.org/viewcvs?limit_changes=0&view=rev

Re: Strange git commit on master branch in gcc git mirror

2011-06-05 Thread Andreas Schwab
"H.J. Lu" writes: > http://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6681e82c16913119b6a3ca0052efe9259d7377a9 > > in git mit mirror, which isn't in svn gcc trunk. It's right here: http://gcc.gnu.org/viewcvs?limit_changes=0&view=revision&revision=174658 Looks like an accident, modifying both trunk

Strange git commit on master branch in gcc git mirror

2011-06-05 Thread H.J. Lu
Hi Jason, There is a strange git commit on master branch: http://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6681e82c16913119b6a3ca0052efe9259d7377a9 in git mit mirror, which isn't in svn gcc trunk. Can you look at a look at it? Thanks. -- H.J.