On 3 April 2012 00:12, Andrew Stubbs <andrew.stu...@linaro.org> wrote:
> Hi all,
>
> Right now, it's impossible to merge from lp:gcc/4.7 to lp:gcc-linaro/4.7.
> This is due to a BZR bug of some kind, so hopefully we won't have to work
> around it for too much longer.
>
> According to the nice folks at #bzr, here's how to do the same merge
> manually:
>
> bzr branch lp:gcc-linaro/4.7
> cd gcc-linaro
>
> bzr log | less
> # find the last merge revision (it should be clear from the message)
> # grab the *SVN* revision number
>
> bzr log --show-ids lp:gcc/4.7 | less
> # search for the *SVN* revision number
> # (it should appear on the end of a "revision-id" line, not "parent")
> # grab the corresponding *BZR* revision number ("revno")
>
> bzr diff -r <bzr-revno> lp:gcc/4.7 > ../patch
>
> patch -p0 -i ../patch
> # resolve conflicts, rejected hunks, etc.
>
> bzr add --file-ids-from lp:gcc/4.7
> # if it's doing the right thing you'll get messages like:
> # "adding <file> w/ file id from <file>"
> # if it just says "adding file" then you got something wrong
>
> # edit Changelog.linaro, as usual
>
> bzr ci
> bzr push lp:~.........gcc-linaro/merge-from....
>
> After all that, a future "bzr merge" should just work (once the bug has been
> fixed).
>
> Anyway, I doubt there's anybody else needs to know this: I've just posted it
> in case I get hit by a bus before next month.
I've added this to the wiki at:
https://wiki.linaro.org/WorkingGroups/ToolChain/BzrTips#How_to_do_a_manual_bzr_merge_when_.22bzr_merge.22_fails
-- Michael
_______________________________________________
linaro-toolchain mailing list
linaro-toolchain@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-toolchain
