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 remembered parent location
bzr+ssh://bazaar.launchpad.net/+branch/kicad/
M eeschema/dialogs/dialog_edit_label.cpp
M eeschema/load_one_schematic_file.cpp
M eeschema/sch_screen.cpp
M include/class_sch_screen.h
All changes applied successfully.
This appears to produce the expected changeset compared to just doing bzr merge
-r5572, which generated the changeset posted previously. A subsequent 'bzr
merge’ seems to bring me up to date with the product branch.
Garth
> On Apr 5, 2015, at 2:04 PM, Garth Corral <gcor...@abode.com> wrote:
>
> 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 figure out how
> to find a proper base for the merge.
>
> Garth
>
>
>> On Apr 5, 2015, at 2:00 PM, Bob Gustafson <bob...@rcn.com
>> <mailto:bob...@rcn.com>> wrote:
>>
>> 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 G
>>
>>
>> On 04/05/2015 02:44 PM, Garth Corral wrote:
>>> 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 remembered parent location
>>> bzr+ssh://bazaar.launchpad.net/+branch/kicad/
>>> <bzr+ssh://bazaar.launchpad.net/+branch/kicad/>
>>> Warning: criss-cross merge encountered. See bzr help criss-cross.
>>> M 3d-viewer/3d_canvas.cpp
>>> M 3d-viewer/3d_canvas.h
>>> M CMakeLists.txt
>>> M Documentation/compiling/mac-osx.txt
>>> M common/draw_panel.cpp
>>> M common/draw_panel_gal.cpp
>>> M common/gal/opengl/opengl_gal.cpp
>>> M common/tool/tool_dispatcher.cpp
>>> M common/view/wx_view_controls.cpp
>>> M eeschema/dialogs/dialog_edit_label.cpp
>>> M eeschema/dialogs/dialog_eeschema_options.h
>>> M eeschema/dialogs/dialog_eeschema_options_base.cpp
>>> M eeschema/dialogs/dialog_eeschema_options_base.fbp
>>> M eeschema/dialogs/dialog_eeschema_options_base.h
>>> M eeschema/eeschema_config.cpp
>>> M eeschema/load_one_schematic_file.cpp
>>> M eeschema/sch_screen.cpp
>>> M gerbview/dialogs/gerbview_dialog_display_options_frame.cpp
>>> M gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp
>>> M gerbview/dialogs/gerbview_dialog_display_options_frame_base.fbp
>>> M gerbview/dialogs/gerbview_dialog_display_options_frame_base.h
>>> M include/class_draw_panel_gal.h
>>> M include/class_drawpanel.h
>>> M include/class_sch_screen.h
>>> M include/view/wx_view_controls.h
>>> -D patches/wxwidgets-3.0.0_macosx_magnify_event.patch
>>> M pcbnew/dialogs/dialog_general_options.cpp
>>> M pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp
>>> M pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp
>>> M pcbnew/dialogs/dialog_general_options_BoardEditor_base.h
>>>
>>> Most of those files are not in the change set for 5572, and the
>>> modifications in this case revert my branch changes. The clue is the
>>> warning at the top about a criss-cross merge, whatever that is. So, off to
>>> the docs to find out how a criss-cross merge happens.
>>>
>>>
>>> Garth
>>>
>>>> On Apr 5, 2015, at 5:22 AM, Wayne Stambaugh <stambau...@gmail.com>
>>>> <mailto:stambau...@gmail.com> wrote:
>>>>
>>>> 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 undone the entire merge unless there is a bug in bzr.
>>>> If there is anything that is not correct, please let me know and I will
>>>> try to fix it.
>>>>
>>>> On 4/5/2015 5:01 AM, Garth Corral wrote:
>>>>> 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 not seen this before with bzr and don’t
>>>>> quite understand what’s going on.
>>>>>
>>>>> Here’s another example:
>>>>>
>>>>> http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/files/head:/common/view/
>>>>>
>>>>> <http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/files/head:/common/view/>
>>>>>
>>>>>
>>>>> Garth
>>>>>
>>>>>
>>>>>> On Apr 5, 2015, at 1:13 AM, Nick Østergaard <oe.n...@gmail.com
>>>>>> <mailto:oe.n...@gmail.com>
>>>>>> <mailto:oe.n...@gmail.com> <mailto:oe.n...@gmail.com>> wrote:
>>>>>>
>>>>>> 2015-04-05 10:11 GMT+02:00 jp charras <jp.char...@wanadoo.fr
>>>>>> <mailto:jp.char...@wanadoo.fr>
>>>>>> <mailto:jp.char...@wanadoo.fr> <mailto:jp.char...@wanadoo.fr>>:
>>>>>>> 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 it claims that the
>>>>>>>> latest rev is 5572, but the change set for 5572 does not show this
>>>>>>>> file. Looking at the file, though, it clearly clobbered the contents
>>>>>>>> of Bernhard’s last commit. There appear to be many more examples.
>>>>>>>>
>>>>>>>>
>>>>>>>> Garth
>>>>>>> I do not see any change in mac-osx.txt between 5571 and 5572 (I compared
>>>>>>> them on my computer, where I still have a 5571 version).
>>>>>>> The latest change is 5305 (2014-11-28 from Bernhard Stegmaier).
>>>>>> I think what Garth is refferin to is the launchpad browser. See:
>>>>>> http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/files/head:/Documentation/compiling/
>>>>>>
>>>>>> <http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/files/head:/Documentation/compiling/>
>>>>>>
>>>>>> Notice the Latest Rev and Last Changed coloumns.
>>>>>>
>>>>>> _______________________________________________
>>>>>> Mailing list: https://launchpad.net/~kicad-developers
>>>>>> <https://launchpad.net/~kicad-developers>
>>>>>> Post to : kicad-developers@lists.launchpad.net
>>>>>> <mailto:kicad-developers@lists.launchpad.net>
>>>>>> <mailto:kicad-developers@lists.launchpad.net>
>>>>>> <mailto:kicad-developers@lists.launchpad.net>
>>>>>> Unsubscribe : https://launchpad.net/~kicad-developers
>>>>>> <https://launchpad.net/~kicad-developers>
>>>>>> More help : https://help.launchpad.net/ListHelp
>>>>>> <https://help.launchpad.net/ListHelp>
>>>>>
>>>>> _______________________________________________
>>>>> Mailing list: https://launchpad.net/~kicad-developers
>>>>> <https://launchpad.net/~kicad-developers>
>>>>> Post to : kicad-developers@lists.launchpad.net
>>>>> <mailto:kicad-developers@lists.launchpad.net>
>>>>> Unsubscribe : https://launchpad.net/~kicad-developers
>>>>> <https://launchpad.net/~kicad-developers>
>>>>> More help : https://help.launchpad.net/ListHelp
>>>>> <https://help.launchpad.net/ListHelp>
>>>>>
>>>> _______________________________________________
>>>> Mailing list: https://launchpad.net/~kicad-developers
>>>> <https://launchpad.net/~kicad-developers>
>>>> Post to : kicad-developers@lists.launchpad.net
>>>> <mailto:kicad-developers@lists.launchpad.net>
>>>> Unsubscribe : https://launchpad.net/~kicad-developers
>>>> <https://launchpad.net/~kicad-developers>
>>>> More help : https://help.launchpad.net/ListHelp
>>>> <https://help.launchpad.net/ListHelp>
>>>
>>>
>>> _______________________________________________
>>> Mailing list: https://launchpad.net/~kicad-developers
>>> <https://launchpad.net/~kicad-developers>
>>> Post to : kicad-developers@lists.launchpad.net
>>> <mailto:kicad-developers@lists.launchpad.net>
>>> Unsubscribe : https://launchpad.net/~kicad-developers
>>> <https://launchpad.net/~kicad-developers>
>>> More help : https://help.launchpad.net/ListHelp
>>> <https://help.launchpad.net/ListHelp>
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~kicad-developers
>> <https://launchpad.net/~kicad-developers>
>> Post to : kicad-developers@lists.launchpad.net
>> <mailto:kicad-developers@lists.launchpad.net>
>> Unsubscribe : https://launchpad.net/~kicad-developers
>> <https://launchpad.net/~kicad-developers>
>> More help : https://help.launchpad.net/ListHelp
>> <https://help.launchpad.net/ListHelp>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to : kicad-developers@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help : https://help.launchpad.net/ListHelp
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
