| vila | gotgenes: did you look at bug #141105 ? | 00:08 |
|---|---|---|
| ubotu | Launchpad bug 141105 in bzr "Crash with authenticated https checkout" [High,Fix released] https://launchpad.net/bugs/141105 | 00:08 |
| gotgenes | bzr: ERROR: Unsupported protocol for url "svn+https://gotgenes.com/svn/csbs/trunk" | 00:10 |
| gotgenes | hmm, but I should have bzr-svn installed, it's under /usr/local | 00:12 |
| gotgenes | any ideas? | 00:22 |
| gotgenes | right, I suppose I didn't install the plugin properly, considering the README says to just copy the directory as ~/.bazaar/plugins/svn | 00:30 |
| * gotgenes sighs | 00:30 | |
| === kiko is now known as kiko-zzz | ||
| ubotu | New bug: #154670 in bzr "bzr can delete a user's working directory, resulting in subsequent errors" [Undecided,New] https://launchpad.net/bugs/154670 | 02:35 |
| thumper | pinging poolie or spiv or lifeless | 04:04 |
| fullermd | Oh my! | 04:04 |
| spiv | thumper: pong | 04:07 |
| thumper | spiv: call? | 04:07 |
| thumper | it'll be quick | 04:07 |
| spiv | thumper: you can try my mobile. Not sure how good the reception will be... (I'm at my parents' place, it has iffy internet and iffy phone coverage) | 04:08 |
| thumper | spiv: :) | 04:08 |
| spiv | thumper: irc is fine too ;) | 04:08 |
| fullermd | Communication is always difficult across generations :p | 04:09 |
| lifeless | thumper: yo | 07:05 |
| thumper | lifeless: hi | 07:05 |
| lifeless | whats up? | 07:05 |
| thumper | lifeless: mostly sorted now | 07:05 |
| thumper | spiv has sorted it out | 07:05 |
| lifeless | ok | 07:06 |
| lifeless | ciao | 07:06 |
| thumper | bye | 07:06 |
| thumper | spiv: see privmsg | 07:08 |
| thumper | spiv: ping | 07:08 |
| thumper | spiv: ^^^ | 07:08 |
| * thumper does it all incase there are special ping rules... | 07:08 | |
| fullermd | OK, so is the "xyz inconsistent parents" line that just showed up in check to do with that reconcile thing that's been going around? | 07:10 |
| thumper | fullermd: I think so | 07:17 |
| thumper | fullermd: you'd know (I think) - how do I apply a bundle? | 07:18 |
| thumper | say one that is attached to an email | 07:18 |
| fullermd | 'pull' or 'merge' should eat it. | 07:33 |
| lifeless | thumper: save hte mail to disk, bzr merge filenameofmail | 07:45 |
| fullermd | lifeless: Should I be expecting rather large number of those 'inconsistent parents'? I've got, like, twice as many as I have revisions... | 07:47 |
| lifeless | thumper: well you can have many per revision | 08:48 |
| lifeless | wel | 08:48 |
| lifeless | fullermd: ^ | 08:48 |
| lifeless | sorry thumper didn't mean you | 08:49 |
| fullermd | Well, I thought they were fallout from really old versions. All the revs here are fairly young (post-0.16, mostly post-0.18) | 08:50 |
| weigon_ | hmm, I'm missing a piece here: | 10:43 |
| weigon_ | $ bzr pull | 10:43 |
| weigon_ | bzr: ERROR: These branches have diverged. Use the merge command to reconcile them. | 10:43 |
| weigon_ | $ bzr merge | 10:43 |
| weigon_ | ... (patches) | 10:43 |
| weigon_ | $ bzr status | 10:44 |
| weigon_ | ... | 10:44 |
| weigon_ | pending merges: | 10:44 |
| weigon_ | Jan Kneschke 2007-10-20 fixed test-case to start the field-indexing at 1 instead of 0 | 10:44 |
| weigon_ | how can I use the old commit msg as new commit msg ? | 10:44 |
| weigon_ | "$ bzr commit" asks me for a new one | 10:44 |
| Peng | I guess you'd just have to copy and paste it. | 10:46 |
| Peng | Usually people use a message like "Merged <branch>". | 10:47 |
| Peng | You don't really need to repeat the message -- 'bzr log' will show it. | 10:47 |
| weigon_ | *doh* now that I see it | 10:48 |
| weigon_ | I assumed there would be a obvious thing I missed :) | 10:49 |
| === kiko-zzz is now known as kiko | ||
| weigon_ | jelmer: where do you want to have bugs reported to for bzr-svn ? | 14:22 |
| jelmer | weigon_: on launchpad please, https://launchpad.net/bzr-svn | 14:22 |
| weigon_ | -> bzr: ERROR: libsvn._core.SubversionException: ("File already exists: filesystem '/svnroot/mysql-proxy/db', transaction '265-1', path '/trunk/tests/suite/base/r/query_analizer1.result'", 160020) | 14:22 |
| jelmer | weigon_: please report that on launchpad :-) | 15:12 |
| jelmer | weigon_: This was during a push? | 15:12 |
| weigon_ | jelmer: yes | 16:36 |
| weigon_ | jelmer: it was a mixed merge + files added | 16:36 |
| weigon_ | a partial commit failed with: | 16:36 |
| weigon_ | $ bzr commit lib/proxy/strict.lua lib/proxy/Makefile.am | 16:36 |
| weigon_ | bzr: ERROR: Selected-file commit of merges is not supported yet: files trunk/lib/proxy/strict.lua, trunk/lib/proxy/Makefile.am | 16:36 |
| weigon_ | so I tried to commit and push everything afterwards | 16:37 |
| jelmer | weigon_: ah, ok | 16:40 |
| jelmer | weigon_: I'm actually working on that bug right now | 16:41 |
| weigon_ | I run 0.91 + bzr-svn 0.4-bzr right now | 16:41 |
| weigon_ | just tell me and I'll test it | 16:41 |
| jelmer | this is bug 145148 | 16:43 |
| ubotu | Launchpad bug 145148 in bzr-svn "svn and bzr-svn clash on commit" [Medium,Triaged] https://launchpad.net/bugs/145148 | 16:43 |
| jelmer | weigon_: ok | 16:43 |
| weigon_ | this is my paste http://p.caboo.se/109159 | 16:43 |
| weigon_ | I tried to register on launchpad, but it didn't seem to like my mailhost | 16:44 |
| jelmer | weigon_: thanks - that does indeed look like bug 145148 | 16:47 |
| ubotu | Launchpad bug 145148 in bzr-svn "svn and bzr-svn clash on commit" [Medium,Triaged] https://launchpad.net/bugs/145148 | 16:47 |
| danigm | hi all again, yesterday I send a question about the distributed development, and the push. dato, ana` says me that you'll respond me, but I go before. Can you help me?? | 17:42 |
| dato | oh well. | 17:43 |
| Lo-lan-do | jelmer: Is bug #145148 the same as Debian #444775, do you think? | 18:06 |
| ubotu | Launchpad bug 145148 in bzr-svn "svn and bzr-svn clash on commit" [Medium,Triaged] https://launchpad.net/bugs/145148 | 18:06 |
| ubotu | Debian bug 444775 in bzr-svn "bzr-svn: Can't push to SVN when a file has been created there" [Normal,Open] http://bugs.debian.org/444775 | 18:06 |
| Lo-lan-do | (If so, I'll mark the latter as forwarded to the former) | 18:07 |
| === Mez|Away is now known as Mez | ||
| jelmer | re | 18:32 |
| jelmer | Lo-lan-do: I think so, but I'm not 100% sure | 18:32 |
| jelmer | should have a fix soon | 18:32 |
| Lo-lan-do | The backtraces look remarkably similar in structure | 18:47 |
| Lo-lan-do | Mine has several calls of _dir_process, but I suspect that's because I'm seeing the bug on a file that's not in the top-level directory, contrary to the test case. | 18:48 |
| jelmer | yeah, indeed | 18:48 |
| jelmer | yours is a little bit more complex though - because of the messing around with the property contents | 18:49 |
| Lo-lan-do | Ah yes, I had forgotten about that. | 18:50 |
| jelmer | weigon_: can you please try again? | 19:13 |
| === Mez is now known as Mez|Away | ||
| === Mez|Away is now known as Mez | ||
| schierbeck | hello lads | 21:30 |
| schierbeck | jelmer: ping? | 21:30 |
| jelmer | schierbeck, pong! | 21:30 |
| schierbeck | hehe | 21:30 |
| schierbeck | so, i'm trying to pull the treeview out of branchwin | 21:31 |
| schierbeck | do you have an opinion on what the base class of the new widget should be? | 21:31 |
| schierbeck | i'm thinking either just the treeview, the scrollwindow surrounding it, or an entirely new widget | 21:32 |
| schierbeck | with a new widget, we could have more control of what signals were sent, and simplify the interface | 21:36 |
| === abadger1999 is now known as abadger199_afk | ||
| jelmer | re | 21:40 |
| jelmer | schierbeck: ... and perhaps embed it in new places | 21:41 |
| schierbeck | jelmer: well, we could do that with a scrollwin, too | 21:41 |
| schierbeck | i'd just like to keep the interface as simple as possible | 21:42 |
| jelmer | schierbeck: yeah, agreed | 21:42 |
| schierbeck | it's possible to add your own signals, right? | 21:42 |
| jelmer | schierbeck: yeah | 21:42 |
| schierbeck | okay | 21:42 |
| schierbeck | i'll work on it a bit | 21:42 |
| jelmer | schierbeck: either treeview or scrollwindow as base class sounds fine | 21:42 |
| schierbeck | i'll start with scrollwin -- if we need more encapsulation we can always change that later | 21:43 |
| === Mez is now known as Mez|Away | ||
| === Mez|Away is now known as Mez | ||
| lifeless | moin | 21:53 |
| nekohayo | hi folks, I have a basic VCS question. Between two revisions, only the changes are saved right? | 22:00 |
| nekohayo | for example, if I have a repository that is very heavy in filesize, it will not be duplicated? | 22:00 |
| lifeless | nekohayo: yes, bzr delta-compresses the repository | 22:24 |
| lifeless | nekohayo: though conceptually we work with full texts | 22:24 |
| schierbeck | jelmer: ping | 23:08 |
| jelmer | schierbeck, pong | 23:08 |
| schierbeck | :) | 23:08 |
| schierbeck | okay, it seems to be working now | 23:08 |
| schierbeck | i started off conservatively | 23:09 |
| schierbeck | wanna have a look? | 23:09 |
| schierbeck | http://bazaar.launchpad.net/~dasch/bzr-gtk/treeview | 23:09 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!