| glyph | is bzr-svn supposed to support the svn:mergeinfo to retrieve merge parents? | 08:51 |
|---|---|---|
| glyph | I have a branch (which, happily, is in a public, open-source project) which has lots of merges from trunk, with appropriate mergeinfo properties on them | 08:52 |
| glyph | 'svn merge --reintegrate branch .' in an SVN working copy works great | 08:52 |
| glyph | 'bzr merge ../branch' in a bzr checkout of trunk gives me tons and tons of conflicts | 08:52 |
| spiv | glyph: https://launchpad.net/bugs/131323 perhaps? It seems that it's half fixed. | 09:10 |
| ubot5 | Launchpad bug 131323 in Bazaar Subversion Plugin "Support svn:mergeinfo (affected: 0, heat: 0)" [Medium,Fix released] | 09:10 |
| spiv | i.e. bzr-svn will update that property, but doesn't use it itself yet. | 09:10 |
| glyph | spiv: Aah. "Fix released" is a misleading state for that bug, given its description. | 09:12 |
| glyph | I had already found it, and my understanding was that I was discovering a bug in the integration, not that the integration didn't exist. | 09:13 |
| spiv | glyph: yes, the NEWS file at least doesn't claim it's fully fixed | 09:21 |
| spiv | glyph: probably just a momentary lapse of attention | 09:21 |
| * spiv reopens | 09:23 | |
| glyph | spiv: Thanks | 09:25 |
| glyph | although this is a little disappointing, I have a long plane-trip ahead of me and I was hoping to experiment with different merge strategies | 09:25 |
| === radoe_ is now known as radoe | ||
| === lifeless_ is now known as lifeless | ||
| lifeless | mornink | 21:44 |
| thumper | lifeless: morning | 22:12 |
| lifeless | thumper: hello! | 22:13 |
| Pilky | lifeless, thumper: who would be the best person to talk to about bzr explorer (especially on the Mac) | 22:15 |
| lifeless | Pilky: uhm, Ian was handing over maintenance of that | 22:16 |
| lifeless | I think bialix probably | 22:16 |
| Pilky | thanks | 22:17 |
| lifeless | who is in Russia, so a bit late right now :) | 22:17 |
| Pilky | yeah | 22:17 |
| Pilky | I'll try tomorrow at a more sane hour | 22:17 |
| lifeless | you could mail the list :) | 22:17 |
| Pilky | just want to talk with him about how explorer works and how to try and make it feel more OS X native | 22:18 |
| lifeless | well its qt | 22:18 |
| lifeless | so is there a qt quartz theme perhaps? | 22:18 |
| Pilky | well, I think that qt wraps around cocoa a bit | 22:20 |
| Pilky | but it's a bit less about appearance and more about placement | 22:20 |
| Pilky | like there is a series of tabs at the bottom, which really should be at the top in a Mac app | 22:21 |
| Pilky | I'll try messaging him tomorrow and try the list if he isn't on | 22:23 |
| Pilky | thanks again :) | 22:23 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!