[00:05] https://bugs.launchpad.net/bzr/+bug/197426 [00:05] Ubuntu bug 197426 in bzr "bzr diff message when some files are not versioned is unhelpful" [Medium,Confirmed] [00:05] there's the bug [00:32] jam: any comments? [00:32] mwhudson: so, its good you're looking [00:32] mwhudson: break out the profiler. [00:33] jam: the Collapsed 1 keys into 1 requests w/ 1 file_ids w/ sizes: [306] [00:33] jam: is a little noisy [00:33] lifeless: take it out [00:33] BB:approve === abentley1 is now known as abentley [01:44] lifeless, cool, I'll try it out this week (re subunit) [01:44] jfroy, pong [01:47] jelmer: I made a checkout of a very small svn repository (< 10 revisions) that had never been used with bzr-svn today, and when I tried to commit back, I got a "Could not determine revno for <...> because its ancestry shows a ghost at <...>" error. [01:47] I can send you the repo if you want, it's pretty easy to reproduce. [01:47] Both bzr and bzr-svn dev. [01:48] jfroy, If you have an easy way to reproduce it, please file a bug against bzr-svn [01:48] OK [01:49] I'll just attach the repository in the bug. [01:55] https://bugs.launchpad.net/bzr-svn/+bug/339749 [01:55] Ubuntu bug 339749 in bzr-svn ""Could not determine revno because of ghost in ancestry" error on commit to bound branch" [Undecided,New] [01:57] added repro steps [02:00] jfroy, works fine here [02:01] does it? [02:01] mmmm [02:01] let me update bzr and bzr-svn [02:01] jfroy, it works with 0.5.2 as well [02:02] ah [02:02] I can now [02:03] it looks like a regression in bzr [02:04] 1.12 works fine, bzr.dev breaks [02:04] jelmer: hmm! [02:05] mm, I still get the error here [02:05] jelmer: ahh, sorry didn't read your message before that last one [02:05] OK [02:06] ah, hmm [02:06] might be a bug in bzr-svn after all [02:06] but indeed a regression [02:19] Hm, anyone know why bzr-loom has replaced bzr stat? I'm not a fan of the changes. === timchen1` is now known as nasloc__ === abentley1 is now known as abentley [02:47] fbond: because it tells you about the loom, its been doing it for a while [02:48] bbiab [03:21] lifeless: i think this summarizes my loggerhead performance playing http://pastebin.ubuntu.com/128584/ === radix` is now known as radix [04:07] jam: http://pastebin.ubuntu.com/128584/ [04:17] can you do the equivalent of svn copy with bzr-svn? [04:20] igc: http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C1236512117.31799.2.camel%40lifeless-64%3E - this recasts the fix you did to get profiling data when ctrl-C is hit to not break layering [04:20] igc: it will make profiling easier for mwhudson [when things go wrong] [04:20] igc: please eyeball :) [04:54] lifeless: that looks pretty sweet [05:20] poolie: good! [06:16] lifeless: en_AU.UTF-8 [06:20] python -Werror ./bzr selftest test_parents.*test_unicode_symlink -v [06:21] fails with [06:21] bzr: ERROR: exceptions.DeprecationWarning: the sha module is deprecated; use the hashlib module instead [06:21] i need to patch it to ignore that [06:21] there's a jaunty bug open [06:22] for me, 4 errors all the same: Unicode unequal comparison failed to convert both arguments to Unicode - interpreting them as being unequal [06:24] DBusException: org.freedesktop.DBus.Error.Spawn.ChildExited: Launch helper exited with unknown return code 0 [06:24] lifeless: tests fail with 32-bit python 2.5.2 on Hardy === thumper is now known as thumper-will-jfd === thumper-will-jfd is now known as thumper-jfdi === thumper-jfdi is now known as thumper [06:42] FWIW I also get that failure, 32-bit python 2.5.2 intrepid. [06:44] spiv: which test? [06:44] mwhudson: 17:20 < lifeless> python -Werror ./bzr selftest test_parents.*test_unicode_symlink -v [06:44] ah === abentley1 is now known as abentley === abentley1 is now known as abentley [08:27] mwhudson: lifeless just told me that you need to update your brisbane-core branch [08:27] I did some updates that should make things like "log -v" faster [08:43] * mwhudson gives it a go [08:48] ja1: https://pastebin.canonical.com/14708/ [08:48] maybe i need a new groupcompress too? [08:51] mm, only a little faster [10:08] Hello again, could someone help me please. Been using bzr for a few weeks, have a stable branch and several development ones. [10:08] I want to add some of the modules created in a dev branch to stable, without creating problems for future merges. What to do? [10:41] hi, any English people here? [10:42] bzr st now shows the message: pending merge tips: (use -v to see all merge revisions) [10:42] I'm curious why there is "see all merge revisions" but not "see all merged revisions"? [10:43] anybody? [10:43] Seems a bit quiet in here at the moment. Sorry, I don't know the answer, not seen it myself yet. [10:44] pysquared: English is foreign language for me. Do you native English speaker? [10:46] bialix: Maybe it's to help make it clear that the revisions haven't been committed yet. [10:46] what's difference? they're anyway mergeD already [10:47] Since it says "pending", I guess that's redundant anyway. [10:47] is not "merge" is a verb? [10:48] "all merge revisions" sounds odd for me [10:48] English is my first language, but I'm kind of terrible at it, so... :P [10:49] heh [10:49] bzr.devs travelling now I guess === lamont` is now known as lamont [10:49] bialix: I think "merged" would sound more natural, but it doesn't bother me. I think "merge" is sometimes used as a noun. [10:50] "merge revisions"? [10:50] in my language it should be "merged revisions" [10:50] but my language is not English [10:50] I guess "merge" would be an adjective describing the revisions? [10:50] yep, I guess so [10:51] hence my question [10:51] "merge revisions" is used like that throughout bzrlib. [10:53] actually 12 times, and half of that count related to status output [10:54] ok, I'm just curious [10:55] Oh, sorry. I made a mistake when grepping and through it was used about 30 times. [10:55] Err, s/through/thought/ [10:55] does not matter. it's used even for log command [10:56] and there revisions are definitely "merged" [10:56] perhaps it's just my shallow knowledge of English [11:00] * SamB wonders why the logs link in the topic doesn't link to this channel's logs [11:00] oh, I guess it's because the logs are broken down first by year ? [11:01] what a strange way to organize logs [11:02] bialix: I don't have a deep understanding of bzr's internals, so I don't know if the concept of a "merge revision" (a revision that, well, did a merge) makes sense, but I think it does. [11:02] bialix: Whether it's a better term than "merged revision" in "bzr status" is another matter. [11:03] Peng_: I don't understand [11:03] Peng_: in log.py the "merge revisions" used in the context: "show me merged revisions" [11:05] bialix: I think the term "merge revisions" makes sense in some situations, but in others it's a mistake. [11:05] bialix: But I could be way off. [11:05] hi jam [11:05] It makes sense *to me*, but might not be right. [11:05] hi bialix [11:06] I've asked about "merge revisions" [11:06] bonjour vila [11:06] jam: why "merge revisions" but not "merged revisions"? [11:11] ja1: wb? [11:12] network here is a bit weak [11:12] bialix: "merge revisions" where is that? [11:12] jam: The output of "bzr status" after "bzr merge", and some other places. [11:12] jam: bzr st now shows the message: pending merge tips: (use -v to see all merge revisions) [11:12] ja1: ^ [11:13] ja1: are you in UK at sprint? [11:13] bialix: hello [11:13] we're in brisbane, australia [11:14] hi poolie [11:14] ah [11:14] and john's here, though not here right at the moment [11:14] sorry [11:14] np at all [11:14] we might have a sprint at the time of UDS in late May in Spain [11:14] poolie, I'm curious about "merge revisions" vs. "merged revisions" [11:14] in case you're interested in coming... [11:14] ok [11:15] bzr st now shows the message: pending merge tips: (use -v to see all merge revisions) [11:15] "merge revisions" sounds odd for Russian mind. Is not "merge" is a verb? [11:15] bialix: We're in brisbane, but yes [11:15] hi bialix [11:15] vila too? [11:16] bialix: yup [11:16] interesting... how do you know that... about Brisbane and Brisbane-core? [11:16] fantastic [11:17] but I will go to sleep in a few minutes, jetlag is still hard... [11:18] sleep well [11:18] thanks [11:18] bialix: 'merge' is a verb, but in this context i guess it can be used as a noun [11:18] 'commit' is similar [11:18] so is 'diff' for that matter [11:19] i think there's a semantic difference that 'merged revisions' are the ones that were merged in [11:19] poolie: it seems like in the "merge revisions" it's used as adjective [11:19] but the 'merge revision' is the one that did the merging [11:19] this might be a bit subtle or potentially confusing though [11:19] yes, it is an adjective there [11:20] poolie: in log.py there is some places too, where "merge revisions" used in context of "show me merged revisions" [11:20] just in comments or parameters, or also for ui? [11:21] comments/parameters [11:22] int he log help there is "merged revisions" used [11:22] in the log help [11:22] so i haven't checked them, but it'd probably good to change them to 'merged' [11:23] and also "a nested merge revision" [11:23] I'm just trying to understand English better [11:23] poolie: I agree with you about the semantic difference. Thank you for articulating it well. :) [11:24] then "merge revisions" == "merged but not committed yet", right? [11:26] bialix: it might be 'revisions that did a merge' [11:26] normally we'd say 'pending merge revisions' to mean not committed [11:27] what it means? 'revisions that did a merge' [11:27] revisions that have more than one parent === montywi|zzz is now known as montywi|meeting [11:28] ah, ok [11:32] * bialix disappears [11:48] abentley: something like: === arjenAU2 is now known as arjenAU === radix` is now known as radix [12:57] any bzr hosting other than launchpad available yet? [12:58] thrope: Any server providing SSH access can do it. :) But no other centralised hosting that I'm aware of. [12:59] thrope: savannah, alioth, gna, ... [12:59] anything for private projects? [12:59] thrope: I don't know; lp can do private projects though [12:59] oh i didnt know [13:00] thanks === montywi|meeting is now known as montywi [14:02] hmm, how come pybaz doesn't have a launchpad project ... [14:17] SamB, I think it's dead upstream [14:17] and its source is not in bzr [14:18] jelmer: which upstream? [14:18] SamB, both baz and pybaz [14:19] pybaz is the Python library for reading baz/tla, isn't it ? [14:19] yes, but it wraps around the baz command line I think [14:19] OH. [14:20] jelmer: what is the standard way to run the tests on TracBzr, do you know? [14:21] I just ran "trial tracbzr" IIRC [14:23] trial ? [14:26] EWWW [14:26] oh trial seems to be a twisted test harness [14:27] well, twisted uses trial at any rate [14:28] * SamB said EWW because he found out that jelmer was right [14:29] rocky, trial isn't really tied to twisted though, it's just a test runner [14:29] * SamB closes the RFP he had started writing [14:29] SamB, EWW? [14:30] jelmer: well, I suppose however you implement something like that has got to be disgusting ... [14:31] SamB, well, it's all legacy code, anyway [14:31] jelmer: i'm trying out nose ... seems to work... but just an fyi i restarted the fix to that _get_weave bug since i know a lot more now and i've done it on a separate branch [14:31] jelmer: i'll set it up for review today [14:31] also gonna add tests [14:32] jelmer: recall that it also does tla [14:32] baz may be legacy, but unfortunately tla isn't :-( [14:33] or should I say "did"? [14:34] SamB, Are you sure it does tla as well? [14:34] admittedly some people are still using tla only because they haven't figured out how to escape yet [14:34] jelmer: well, okay, supposedly it can import Arch branches [14:35] SamB, ah, but that's probably because the repo formats from arch and baz are compatible? [14:35] I was kind of hoping pybaz actually understood the format [14:37] anyway, my point is, while baz may be legacy, the format is unfortunately not and tools for importing (or foreign-branching) it would still be useful [14:38] at this point, the easiest way to use an arch repository is probably through git-archimport [14:38] or is it just git-arch ... [14:40] well, that also runs a command-line tool ... maybe it would be good to add tla support to pybaz? [14:40] (that is, git-archimport uses tla internally) [14:43] * SamB accidentally finds the GPL'd TLA FAQ in his googles and contemplates a BSD'd TLA FAQ [14:45] SamB, well, baz and pybaz are still there [14:45] SamB, and as far as I know they work [14:45] so there shouldn't be a particular reason to go through git [14:55] awilkins, hi [14:55] awilkins, any chance you can file a bug about that branch issue you mentioned yesterday? [14:55] I can reproduce it [14:58] jelmer: np. === thunderstruck is now known as gnomefreak [15:16] https://bugs.launchpad.net/bzr-svn/+bug/339974 [15:16] Ubuntu bug 339974 in bzr-svn "AssertionError on branching mythtv.org svn repository" [Undecided,New] [15:16] * mtaylor hates to ask this question... [15:16] anybody know where I can get recent bzr rpms for SuSE 10.3 ? [15:18] * mtaylor cries when people use SuSE [15:18] God kills an iguana when people use SuSE [15:19] * awilkins thinks that might have been funnier if he said "chameleon" [15:28] jelmer: i just proposed my bug branch for merging into trunk for TracBzr [15:33] ugh, there's nothing that hurts more than a mis-resolved conflict in your history [15:37] hello people, I can't seem to find how to ignore changes on commited files [15:40] ? [15:52] lifeless: hey... if i have a revid and i know what repo it came from, i should be able to figure out which branches in that repo has that rev applied right? [15:52] lifeless: which would NOT be the case if i had the revno (and no branch nick) [16:01] mamruoc: You can't. You could use "bzr rm --keep whatever.txt" if you want to stop versioning it. [16:02] Peng, shouldn't this been a feature bzr should have? [16:04] Is it possible to take a CVS checkout, and then import the versions that are present in that checkout into CVS? [16:05] mamruoc: Yes, but it doesn't. [16:06] NCommander: There are, um, CVS to bzr converters that can work remotely.. [16:06] Peng, I'm not being clear [16:06] I have a working tree, from abotu six months ago [16:06] I want to convert history from that point into bazaar, but nothing from the future [16:07] hmm i'm having trouble pushing to a new lp branch... bzr: ERROR: File exists: '/srv/bazaar.launchpad.net/push-branches/00/00/97/8a/.bzr' [16:07] any clues on how to fix this? [16:08] Peng, are the any ongoing work for this? [16:10] hmm i had registered branch prior to pushing, and deleting the branch in lp and just pushing seems to have worked [16:14] for the convenience of anyone looking for the code until the server goes back up, and i'm sure for the annoyance of sid3w1nder... [16:14] https://launchpad.net/bitlbee-snapshot [16:15] :) [16:17] mamruoc: I don't know of any. [16:17] oh crap [16:17] wrong channel [16:17] why do i keep the two "b" channels next to each other [16:17] NCommander: Oh. I dunno. Worst case, convert the whole thing, then "bzr uncommit" or "bzr branch" to get rid of it. [16:18] Peng, oh yay, uncommitting a year of commits -_-; [16:18] Is there a good guide on how I go about doing this? (or should I just let Launchpad's CVS importer work) [16:18] NCommander: uncommit can handle multiple revisions at a time. [16:19] Sorry, I dunno. [16:58] hey ... i'm working on code in a branch ... i did a merge from another branch and forgot to commit it ... i since then changed more code and was about to commit when i realized my changes are messed up with the merge commit ... is there anyway to separate the merge changes and my local changes at this poi8nt? === montywi is now known as montywi|food [17:11] rocky: You could use "bzr shelve" to temporarily get your new changes out of the way. [17:15] or unmerge, commit, remerge(, commit)? === nevans1 is now known as nevans [17:17] Tak: ah that's what i was looking for [17:17] thx [17:19] Oh, you had committed the merge? Sorry I misunderstood. [17:20] no i hadn't committed the merge [17:20] which means i misunderstood ;) [17:21] Oh. [17:21] does anyone know if branch.revision_history() ever changed such that once it listed individual merge items VS now just returning the revision belonging to the complete merge? [17:44] Hm, the last Planet Bazaar post was on March 3. Surely something is wrong. [17:47] rockstar: "Last updated: March 03, 2009 11:06 AM" <-- looks like it [17:59] with all the talks about changing the default branch format, the thought occurred to me: would it be useful to have a configuration variable for the default repository / branch format? [18:38] jfroy: I'm not sure it's worth the confusion it could cause. Since DVCSes are all about collaborating with other people, I think it's best for everybody to be in the same default format boat. [18:39] jfroy: OTOH, always typing "bzr init-repo --1.9" is getting old... :P [18:39] Peng_: well they are changing it to 1.9 :p [18:39] ...Good point. [18:40] I had in mind my workflow, which involves creating repos with 1.9-rich-root all the time (I interface with subversion repos. a lot) [18:40] jfroy: Yeah, but if you set your default to 1.9-rich-root, it's easier to accidentally create rich-root repos for projects that shouldn't have them. [18:41] arguably bazaar shouldn't have the rich root thing. It's a screw up from the early days :/ [18:43] Yep. The problem now is dealing with that mistake. === Mez_ is now known as Mez [18:49] It should have been dealt with a long time ago... [18:49] The longer it stays around, the harder it will be to fix it, IMHO. [18:49] Anyways :/ [18:51] jfroy: The current (tentative?) plan is to do it with the brisbane-core/CHK formats. Upgrading them requires reserializing inventories(?) anyway, so it's a good time to do it. [18:51] s/them/to them/ === fta_ is now known as fta [18:51] Interesting. brisbane-core will be *yum*. The speed, oh my! [18:52] Well, hopefully. [19:13] so... what's the problem with using --1.9-rich-root on a repo that shouldn't have them? [19:23] rocky: If anyone else has a non-rich-root copy, they have to upgrade before they can pull from you. [19:23] rocky: Unless the project is willing to upgrade to rich-roots, your branches will be effectively unmergeable. [19:24] https://bugs.launchpad.net/bzr/+bug/340108 :/ [19:24] Ubuntu bug 340108 in bzr ""Ancestry ends with <...>, not null" error while branching lp:ipython" [Undecided,New] [19:25] I have a bzr-svn question (ping: jelmer) - I have two diverged branches, craeted with bzr with nothing to do with svn... they have a shared history up to revision 24 or so. I would like to push these both into a svn repository... at the moment I just tried svn-push (push caused a traceback) each one to two different dirs, but all the common commits appear twice [19:26] is there a way to push them while keeping the branch relationship in svn terms (ie have one as a copy of the other) [19:26] thrope, if you got a traceback from svn-push, please file a bug [19:26] jelmer: from normal push, not svn push [19:27] thrope, still, please file a bug [19:27] also: I always get upgrade to subversion 1.5 message although I am using 1.5.5 on both client and server [19:27] thrope, that's fixed in bzr-svn trunk [19:29] the error is:bzr: ERROR: exceptions.NotImplementedError: [19:29] Hi all. [19:30] jelmer: https://bugs.launchpad.net/bzr-svn/+bug/340110 [19:30] Ubuntu bug 340110 in bzr-svn "Massive memory consumption while fetching a revision with a large file" [Undecided,New] [19:30] Where can I find the bzr-svn-0.5 branch? http://bazaar-vcs.org/BzrForeignBranches/Subversion#development seems to be empty. [19:30] rindolf: http://people.samba.org/bzr/jelmer/bzr-svn/0.5 [19:30] rindolf: bzr branch http://people.samba.org/bzr/jelmer/bzr-svn/0.5/ [19:31] rindolf: It's not actually empty. [19:31] it's a branch :p [19:31] Peng_: thanks. [19:32] Well, it would be useful to make the web-service put some nice information there. [19:32] Peng_: with the command you gave me, etc. [19:33] rindolf: It's hardly a "web-service". The HTTP server is just serving a bunch of opaque files. [19:33] Peng_: then why is it empty? [19:34] rindolf: Because the files are in the directory ".bzr", and Apache's directory listings don't show dotfiles by default. [19:34] 11464kB - holy shit. [19:34] Do you store .iso's there? [19:37] rindolf: No, but you now have a local copy of all the 3861 (or so) revisions that make up bzr-svn's history. [19:37] hmeland: I see. [19:38] If you just want the current code, you can use "bzr checkout --lightweight http://...". [19:38] $ ls -l bzr-svn-0.5.2.tar.gz [19:38] -rw-r--r-- 1 shlomi shlomi 232794 2009-02-18 10:09 bzr-svn-0.5.2.tar.gz [19:39] Though you've already downloaded it, so it would be a bit silly to delete it, unless you really need the disk space... [19:46] Hi, I have a question. I need to make a bzr branch that is able to update stuff from a git repository, but ignores the stuff that comes from git for revisioning [19:46] I found this: http://bazaar-vcs.org/BzrForeignBranches/Git, which depends on Dulwich, and has a Ubuntu PPA, but the ppa only has 32bit packages [19:47] Is Dulwich available for 64bit? [19:47] you can install it from source, it seems to work [19:47] Ok [19:48] rindolf: fwiw, i'm working on ClueBzrServer which will allow for http-based browsing (akin to mod_svn) for current revisions of files from bzr [19:48] rocky: ok, thanks. [19:48] (though tests don't pass on 64 bit) === UdontKnow is now known as KnightWhoSaysNi [19:55] how would I install dulwich? I'm not sure how to make setup.py work [19:55] ahh nm [19:56] OK, https://bugs.launchpad.net/bzr-svn/+bug/311712 - I was able to build an .rpm out of subvertpy and bzr-svn. [19:56] Ubuntu bug 311712 in bzr-svn "bzr-svn-0.5.0~rc1 - python setup.py bdist_rpm fails" [Low,Fix released] [19:56] Thanks everybody. [19:58] Another question... I have a -lot- of bzr branches from various projects. Is there any tool to check which are outdated? [20:00] vadi2: there is a plugin that can tell you which are merged into some other branch [20:01] mm [20:02] vadi2: https://edge.launchpad.net/bzr-removable [20:02] I see [20:12] mwhudson, tests do pass on 64bit these days [20:13] jelmer: oh right [20:14] jelmer: want to mark https://bugs.edge.launchpad.net/dulwich/+bug/337483 as fixed then? [20:14] Ubuntu bug 337483 in dulwich "dulwich.tests.test_pack.TestPackData.test_iterentries fails on a 64-bit system" [Undecided,New] [20:14] mwhudson, we need a IRC interface to Launchpad :-) [20:14] indeed [20:14] ubottu, bug 337483: status fixreleased [20:14] Launchpad bug 337483 in dulwich "dulwich.tests.test_pack.TestPackData.test_iterentries fails on a 64-bit system" [Undecided,New] https://launchpad.net/bugs/337483 [20:25] I installed bzr-git as the help file says (move to ~/.bazaar/plugins and rename to git), but now it says this: "Unable to load plugin 'git' from '/home/vadi/.bazaar/plugins'" [20:25] excuse me I'm new and I have a question [20:26] vadi2: There should be details in ~/.bzr.log [20:26] I created a branch on launchpad, now I made some changes to the code that I can see on bzr diff [20:26] how do I commit the changes to that branch? [20:26] luca: "bzr commit". You should read the tutorial. [20:26] Or something. [20:27] but if I write commit, is it sure that the change goes to the launchpad branch? [20:27] "from bzrlib.foreign import foreign_vcs_registry [20:27] ImportError: No module named foreign [20:27] " [20:29] vadi2: Your bzr is too old. [20:29] vadi2: Or it's broken. I dunno. [20:29] i'm on ubuntu 8.10 [20:29] Ok. [20:30] vadi2: And your bzr is too old. [20:30] vadi2: You could use https://launchpad.net/~bzr/archive/+ppa [20:30] (if that's the right link) [20:30] vadi2: if you're trying out bzr-git, you'll need bzr.dev [20:31] Oh. [20:32] where can I obtain that? [20:32] bzr branch http://bazaar-vcs.org/bzr/bzr.dev/ [20:32] (if that's the right link) [20:32] Peng_, yes, it is [20:33] ' ERROR: Unknown repository format: 'Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n' [20:33] ' [20:33] Heh, and the recent format upgrade finally hurts someone. [20:34] Peng_, I think it's already hurt more people [20:34] Peng_, lenny has 1.5 [20:34] Nice. [20:47] okay, bzr.dev installed [20:57] I think I just set up something similar to http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#team-collaboration-distributed-style - The server hosting the main branch will also host a web page of the repo. Is there something wrong with using the repo as the document root of a web server, is there a better way to do it? [20:57] Sorry... I tried git-import, and get this: "bzr: ERROR: No module named commit [20:58] You may need to install this Python library separately. [20:58] " [20:59] vadi2: I think that's a dulwich bug. jelmer, you deleted dulwich/commit.py but repo.py still imports it. [20:59] vadi2, do you have the latest dulwich (from trunk) and bzr-git (from my branch) ? [21:00] I have both latest from their main branches [21:00] so maybe not bzr-git from your branch [21:01] ...And then it imports object.Commit, overwriting commit.Commit... [21:01] Err, objects.Commit. Plural. [21:02] Peng_, vadi2: please try again [21:02] jelmer: bzr-git from trunk is newer than your branch [21:02] try what? [21:02] vadi2, with the latest revision from my branch [21:02] vadi2, my branch is at http://people.samba.org/bzr/jelmer/dulwich/trunk [21:02] jelmer: Oh, perfect. [21:03] :) [21:04] getting your branch made it crash [21:04] http://paste.pocoo.org/show/107143/ [21:05] oh, hm. But I do have dulwich installed. [21:06] what is the proper procedure for installing it? I used ./setup.py build, sudo ./setup.py install [21:07] vadi2, for dulwich, that should work [21:08] yeah, but I tried getting your branch, and got this: http://paste.pocoo.org/show/107143/ [21:08] it says I need to install dulwich and then crashed === montywi|food is now known as montywi [21:18] lifeless, what should I replace multiply_tests_from_modules with? [21:20] Is there a command to delete all unversioned files? [21:22] vadi2, bzr clean-tree [21:23] thank you === TheMuso_ is now known as TheMuso [22:04] Anyone know if the bzrtools package includes the push-and-update plugin? [22:05] thecookie: It doesn't. [22:05] Last I saw anyway... [22:10] hi [22:16] how do i revert back to a specific revision? [22:17]