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 remember
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 rem
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
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
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 rememb
I am not quite sure what I should do to fix the issue.
Is it possible for some devs who is on windows to help fixing this issue?
2015-04-03 10:48 GMT+02:00 Bernhard Stegmaier :
> Hi,
>
> as far as I remember we discussed this for OS X with Wayne some while back…
> On OS X Wayne just added some sp
Glad to help
05.04.2015 19:03, Maciej Sumiński пишет:
Thank you Eldar, I committed your patch in 5577.
Regards,
Orson
On 04/05/2015 12:26 PM, Eldar Khayrullin wrote:
Hi all.
Patch to another translatable entry.
___
Mailing list: https://launchpad
Ok :-)
05.04.2015 18:59, Marco Ciampa пишет:
Sorry Eldar! I have to check email _before_ posting!
Sorry for the noise!
--
Marco Ciampa
I know a joke about UDP, but you might not get it.
++
| GNU/Linux User #78271 |
| FSFE fellow #364 |
+--
Thank you Eldar, I committed your patch in 5577.
Regards,
Orson
On 04/05/2015 12:26 PM, Eldar Khayrullin wrote:
> Hi all.
> Patch to another translatable entry.
>
>
>
> ___
> Mailing list: https://launchpad.net/~kicad-developers
> Post to : kicad
Sorry Eldar! I have to check email _before_ posting!
Sorry for the noise!
--
Marco Ciampa
I know a joke about UDP, but you might not get it.
++
| GNU/Linux User #78271 |
| FSFE fellow #364 |
++
__
Routing options context menu miss the i18n macro.
Attached patch (please check it!)
--
Marco Ciampa
I know a joke about UDP, but you might not get it.
++
| GNU/Linux User #78271 |
| FSFE fellow #364 |
++
=== modified file 'pcbnew/router/p
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 u
Thank you. I just noted that I made a typo somehow. Please apply the
attached patch.
I also found that I did not add the best translators of all time
(maybe not all time), but at least recent time. Kerusey and Marco. So
I added them also.
2015-04-05 11:49 GMT+02:00 jp charras :
> Le 03/04/2015 16
Hi all.
Patch to another translatable entry.
=== modified file 'pcbnew/router/pns_tool_base.cpp'
--- pcbnew/router/pns_tool_base.cpp 2015-03-10 14:38:27 +
+++ pcbnew/router/pns_tool_base.cpp 2015-04-05 10:03:31 +
@@ -57,7 +57,8 @@
TOOL_ACTION PNS_TOOL_BASE::ACT_RouterOptions( "pcbnew.In
Le 03/04/2015 16:20, Nick Østergaard a écrit :
> Hello
>
> This patch syncs the about dialog with AUTHORS.txt, and updates the
> copyright year.
>
> Nick Østergaard
Committed. Thanks.
--
Jean-Pierre CHARRAS
___
Mailing list: https://launchpad.net/~
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
2015-04-05 10:11 GMT+02:00 jp charras :
> 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
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 l
18 matches
Mail list logo