jam | bjp: bzr tag -r `bzr revno --tree` foo | 03:44 |
---|---|---|
=== jordan_ is now known as jordan | ||
vila | hi all ! ;) | 07:37 |
mgz | morning | 08:13 |
jam | mgz: morning, care to hang out in mumble? | 08:29 |
jam | hi vila | 08:29 |
vila | mgz, jam: hey | 08:30 |
=== mmrazik is now known as mmrazik|lunch | ||
=== mmrazik|lunch is now known as mmrazik | ||
mnn | hi... after some time with bazaar, I've stumbled upon something | 13:47 |
mnn | I don't understand why parent_branch is shared for pull and merge | 13:48 |
mnn | I push/pull to the same location - on a remote server | 13:48 |
mnn | however I would like to merge from local trunk | 13:48 |
mnn | so if I have parent_branch defined to the push location (i.e. remote server) - bazaar explorer freezes sometimes - usually on refresh (I don't have very good internet connection) | 13:49 |
mnn | but if I set parent_branch to local trunk, bazaar explorer's bottom panel works the other way around - if trunk has revisions that my branch does not, it shows that " Branch has changes not present in its parent branch": new files in trunk are shown as deleted in my branch | 13:52 |
mgz | mnn: so, it's not shared as such | 14:06 |
mgz | there's also a submit_branch which is more merge related | 14:07 |
mgz | mnn: if you do `bzr info` from the branch that upsets explorer, what does it say? | 14:07 |
=== SamB_Mac_ is now known as SamB_MacG5 | ||
=== deryck is now known as deryck[lunch] | ||
=== deryck[lunch] is now known as deryck | ||
* SamB_MacG5 is happy, he finally found the pre-built ppc/i386 universal builds of Qt | 17:48 | |
SamB_MacG5 | Okay, I just made a shiny new Mac OS X 10.5 ppc/i386 universal installer for Bazaar, but how am I supposed to *test* the thing? | 23:34 |
SamB_MacG5 | besides the obvious "does it install" | 23:34 |
SamB_MacG5 | and "does it seem to work" | 23:34 |
* SamB_MacG5 supposes "bzr selftest" is relevant | 23:35 | |
fullermd | Well, if selftest passes, it shows it works right. If selftest fails, it shows that the tests are awesome. Obviously, win-win 8-} | 23:50 |
SamB_MacG5 | hmm, what's a good way to find the latest plugin versionss supporting bzr 2.3 ? | 23:56 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!