When you merged r5571, did you get the same listing of modified files?
What about the -D (unversioned, deleted) note on your
patches/wxwidgets-3.0.0_macosx_magnify_event.patch file ?
You could save the r5571 merged file and then build and test that.
I think you are pretty close!
Have fun
Bob
Okay, I guess I was closer than I thought (hopefully).
In my already-merged-up-to-5571 branch, explicitly specifying a base and other
revision seems to do what I want:
$ bzr merge -r5571..5572
Merging from remembered parent location
bzr+ssh://bazaar.launchpad.net/+branch/kicad/
Merging from
Cool. Maybe you are 'there'.
Bob G
On 04/05/2015 04:28 PM, Garth Corral wrote:
Okay, I guess I was closer than I thought (hopefully).
In my already-merged-up-to-5571 branch, explicitly specifying a base
and other revision seems to do what I want:
$ bzr merge -r5571..5572
Merging from
As I said, merging up to 5571 was fine; all the changes look sane. Merging
just 5572 after that introduces the changes listed, which is not correct.
Unfortunately, using the suggested merge-type in the documentation does not
resolve my issue, so I’m not really all that close. I need to
I noticed an odd history tree in my checked out branch before I made
this commit but when I checked the status it showed the correct files
committed. I'm not sure what's going on here. I did merge some code
into this branch for testing and then did a revert on the whole branch
so it should have
Le 05/04/2015 06:02, Garth Corral a écrit :
Is it just me or did this commit clobber a bunch of files it probably
shouldn’t have?
Not being super familiar with bazaar I’m not quite sure what I’m
seeing.
For example, if you browse the code to
Documents/compiling/mac-osx.txt in launchpad
Yes. Thanks, Nick. Sorry, I should have been more clear.
I only noticed this, though, when I merged trunk into my branch and got a bunch
of diffs that didn’t seem right. There were diffs that seemingly wanted to
revert changes I’d already taken, and they were all these mystery changes. I’ve
Thanks, Wayne. To be honest I’m still trying to figure things out, both with
this merge and with bazaar in general. I now have a clue about what’s going on.
I merged my branch up to 5571 and all is well. I then tried to merge 5572 and
got the following:
$ bzr merge -r5572
Merging from
8 matches
Mail list logo
