On 08/13/2011 10:57 AM, Michael Hope wrote:

On Sat, Aug 13, 2011 at 8:10 PM, Michael Hope michael.hope@linaro.org wrote:

...

On Sat, Aug 13, 2011 at 7:31 PM, Andrew Stubbs ams@codesourcery.com wrote:

...

Hi all,

I'm having real trouble here :(

I just can't seem to get bzr to work! I've tried to branch gcc-linaro/4.6 again and again, and it just won't. My other machine refuses to do the merge from lp:gcc/4.6, presumable because the bzr on there is too old.

I'm stuck. Can anybody else do the merge from upstream?

I'll give it a go...

It looks OK: https://code.launchpad.net/~michaelh1/gcc-linaro/merge-from-fsf-r177703-4.6

I did the merge complete with conflicts in one revision, then fixed the conflicts and added the ChangeLog in follow up commits. Could you review them please?

looks ok (based on the merge I did for the gcc-4.6 packages). Could gcc-4.5 be merged as well?

On 15/08/11 02:02, Martin Pool wrote:

On 13 August 2011 17:31, Andrew Stubbsams@codesourcery.com wrote:

...

Hi all,

I'm having real trouble here :(

I just can't seem to get bzr to work! I've tried to branch gcc-linaro/4.6 again and again, and it just won't. My other machine refuses to do the merge from lp:gcc/4.6, presumable because the bzr on there is too old.

I'm stuck. Can anybody else do the merge from upstream?

Are you getting an error? If so, please let me know, or file a bug, or ask in #bzr.

Hi Martin,

I can't reproduce either problem at the moment.

The machine with the old bzr has just been retired (finally), so hopefully that's a moot problem. In any case, it was an old one, so not your problem.

The problem branching to my local machine has also gone away. For a couple of days it just wouldn't work, but now I can't make it not work. There's been no software update (as far as I know) so I presume the problem was something else. (It could have been the power management on my wireless card? When I first tried it the machine was doing nothing else, but when I've tried it since I've been actively using it.)

Anyway, thanks for the offer.

Andrew

On Wed, Aug 17, 2011 at 6:40 AM, Christian Robottom Reis kiko@linaro.org wrote:

On Sat, Aug 13, 2011 at 08:31:08AM +0100, Andrew Stubbs wrote:

...

I just can't seem to get bzr to work! I've tried to branch gcc-linaro/4.6 again and again, and it just won't.

What are the symptoms? Let us get somebody to look at it -- but I need some more information.

Andrew's going to talk with Martin about the problem. A from-scratch branch/merge worked fine for me with 2.3.4 on EC2.

-- Michael