| jelmer | Solarion: yeah, I am | 00:00 |
|---|---|---|
| jelmer | Solarion: just busy getting this bug fixed.. | 00:00 |
| Riddell | how do I fix a bad lock in launchpad? "Unable to obtain lock lp--1221055540:///lock held by jr@bazaar.launchpad.net on host vostok [process #18204] locked 34 hours, 38 minutes ago" | 00:05 |
| Peng | Riddell: Running bzr break-lock on the URL should fix it. | 00:08 |
| Peng | Riddell: Well, first make sure you don't actually have a bzr process from 35 hours ago running. :P | 00:08 |
| Riddell | let me try | 00:13 |
| jelmer | Solarion, fixed | 00:21 |
| Riddell | works well | 00:34 |
| Riddell | thanks Peng | 00:34 |
| ubotu | New bug: #177809 in bzr "bzr mv should handle and report failure better" [Undecided,New] https://launchpad.net/bugs/177809 | 03:15 |
| abentley | jelmer: if rich-root-pack is experimental, that's a bug. | 03:32 |
| CardinalFang | I want to write a plugin hook on "post-commit" that peeks at the commit message and performs some action based on it. Can I traverse the data given to me in the "master" parameter to get to it? | 04:59 |
| CardinalFang | I really don't want to spawn a subprocess to run "bzr log". | 05:00 |
| lifeless | CardinalFang: sure | 05:01 |
| lifeless | CardinalFang: see what bzr-email does for instance | 05:01 |
| spiv | via last_revision() on the branch, I'd guess. | 05:02 |
| CardinalFang | Hmm. | 05:02 |
| igc | have a good xmas and New Year everyone - see you in 2008 | 05:02 |
| spiv | igc: see you! | 05:02 |
| igc | see ya spiv | 05:02 |
| abentley | igc: Happy holidays | 05:18 |
| spiv | Ok, I think that's probably it from me for the day. | 05:58 |
| spiv | Happy holidays everyone! | 05:58 |
| lifeless | bye! | 06:03 |
| abentley | spiv: Happy holidays | 06:16 |
| vila | haaaa, vcs-import resurrected the python branch ! 400 mails, one for each commit since october 5st 8-) | 06:27 |
| === weigon_ is now known as weigon | ||
| lifeless | does vcs-import use packs yet ? | 07:13 |
| i386_ | hey lifeless | 07:27 |
| lifeless | hi | 07:45 |
| mwhudson | lifeless: i expect so | 08:39 |
| mwhudson | $ bzr info http://bazaar.launchpad.net/~vcs-imports/openoffice/2.0 | 08:40 |
| mwhudson | Standalone branch (format: knitpack-experimental) | 08:40 |
| mwhudson | Location: | 08:40 |
| mwhudson | branch root: http://bazaar.launchpad.net/%7Evcs-imports/openoffice/2.0/ | 08:40 |
| lifeless | mwhudson: should upgrade all existing branches tho :) | 08:46 |
| mwhudson | lifeless: yeah, i guess | 08:46 |
| mwhudson | lifeless: need to reconcile all branches first, i guess | 08:46 |
| lifeless | can convert and then reconcile | 08:47 |
| lifeless | be faster | 08:47 |
| ubotu | New bug: #177855 in bzr "assertionerror trips on pull --overwrite in dirstate branch with non-canonical history" [Undecided,New] https://launchpad.net/bugs/177855 | 09:25 |
| mindstorms | hi there! is anyone using bzr-svn? | 09:58 |
| mindstorms | I have quite a few questions and I cannot find the answer online, so I thought I'll find somebody here using it | 10:06 |
| mwhudson | i have used it | 10:07 |
| mindstorms | against what svn version? I am on Mac using a disk image svn install for 1.4.4 | 10:10 |
| mindstorms | so my first question is: do I still need to patch svn and rebuild it locally? | 10:10 |
| mindstorms | and then usability questions | 10:10 |
| mindstorms | :) | 10:10 |
| mindstorms | connecting to SVN repo=checking out a SVN repo? | 10:11 |
| mindstorms | committing to SVN from Bzr=is it the bzr commit or is it something else? | 10:12 |
| mindstorms | if it is bzr commit then how can I have initially just a local bzr commit and just afterwards push it to svn | 10:12 |
| mindstorms | or this op is actually not supported | 10:12 |
| mindstorms | 3/ what exactly does this mean: "Track Bazaar merges in Subversion. Merged revisions show up as ghosts." | 10:13 |
| mindstorms | (all these questions are based on the information found on http://bazaar-vcs.org/BzrForeignBranches/Subversion) | 10:13 |
| mindstorms | I guess I'm just having too many questions :( | 10:18 |
| mwhudson | mindstorms: yes, you need to patch svn | 10:19 |
| mwhudson | then once you've done | 10:19 |
| mwhudson | bzr branch <svn url> | 10:19 |
| mwhudson | you make changes, local commits, etc | 10:19 |
| mwhudson | then bzr push will convert them into svn commits | 10:19 |
| lifeless | mindstorms: to push to a new svn branch from bzr 'bzr svn-push' will do that | 10:22 |
| mindstorms | great it sounds all good... except the part about rebuilding the svn :( | 10:24 |
| mindstorms | is there a simpler solution? I mean if somebody has already built it for my OS (Mac OS 10.4) can I only replace some pieces and get it working? | 10:27 |
| mindstorms | (the real problem is that I don't have xcode installed, and if it would be possible I would delay this for a while) | 10:27 |
| mwhudson | mindstorms: intel or ppc? | 10:37 |
| mindstorms | intel | 10:37 |
| mwhudson | then i don't know | 10:37 |
| mwhudson | i uploaded a ppc build somewhere, but i guess that doesn't help | 10:38 |
| mindstorms | it is just the regular MacBookPro machine with intel proc | 10:41 |
| mindstorms | don't tell me you had the ppc version, cause that would be too funny :) | 10:41 |
| mindstorms | I am sure it will not unfortunately | 10:41 |
| mindstorms | hopefully there is another bzr-svn user that did this on the intel based Mac | 10:42 |
| mwhudson | there was a guy in here yesterday who managed it | 10:43 |
| mindstorms | interesting... is this chat logged somewhere so that I can look for him? | 10:43 |
| mwhudson | http://irclogs.ubuntu.com/2007/12/20/%23bzr.html, but it seems i was misremembering :( | 10:47 |
| === jrydberg__ is now known as jrydberg | ||
| mindstorms | it's a bit weird to me that there aren't many users for this feature | 11:39 |
| lifeless | there are quite a few; its discussed a bit most days here | 11:40 |
| mindstorms | I still keep my hope then | 11:41 |
| mindstorms | do you have any ideas how should I proceed further? like putting up a notice or something like that | 11:41 |
| mwhudson | maybe send a mail to the mailing list | 12:00 |
| mwhudson | it would be very handy to get an installer for a patched svn for os x/intel uploaded somewhere | 12:01 |
| AfC | (what feature are you looking for?) | 12:01 |
| mwhudson | AfC: bzr-svn | 12:01 |
| speakman | hello ppl | 12:15 |
| speakman | anyone awake? | 12:15 |
| mwhudson | maybe | 12:16 |
| mindstorms | that may be an idea | 12:18 |
| ubotu | New bug: #177872 in bzr "unable to load plugin 'version_info_format_c' " [Undecided,New] https://launchpad.net/bugs/177872 | 12:25 |
| mindstorms | I hope I've posted through gmane | 12:28 |
| pitti | hi | 12:38 |
| pitti | I'm curious; I just upgraded my apport branch to pack, after which .bzr was 3.2 MB; now I reconciled, and it grew to 6.4 MB; what did that actually do? | 12:38 |
| mwhudson | anything in obsolete-packs? | 12:39 |
| pitti | 3,2M./.bzr/repository/obsolete_packs | 12:39 |
| pitti | that would be the 3.2 MBs | 12:39 |
| mwhudson | well, there we go then :) | 12:40 |
| pitti | can this just be killed? or is it useful for anything? | 12:40 |
| mwhudson | it's killable i think | 12:41 |
| mwhudson | though i think the next time bzr obsoletes a pack, it will delete whatever's in there | 12:41 |
| mwhudson | it won't grow without bound | 12:41 |
| pitti | and another question, if I may | 12:41 |
| pitti | Lp now has bzr 1.0; will branch formats be converted wholesale, or should this be triggered with bzr upgrade bzr+ssh://bazaar.launchpad.net/...? | 12:42 |
| pitti | bzr info <remote> just says 'unknown' format | 12:43 |
| mwhudson | we're not going to upgrade branches wholesale | 12:43 |
| mwhudson | i don't think upgrade works over bzr+ssh | 12:43 |
| mwhudson | try bzr upgrade sftp:// ... | 12:43 |
| mwhudson | (or if it's huge, we can do this locally, but (a) 3.2 megs isn't huge, (b) *you* can do it from some data centre machine :) | 12:44 |
| * mwhudson off for lunch | 12:44 | |
| abentley | pitti, you have probably upgraded your repo, but not your branches. We don't have a short name for the combination this produces. | 12:45 |
| pitti | mwhudson: ok, thanks for the heads-up! | 12:45 |
| abentley | But it's perfectly safe. | 12:45 |
| ubotu | New bug: #177874 in bzr "upgrading to rich-root-pack fails" [Undecided,New] https://launchpad.net/bugs/177874 | 12:46 |
| abentley | bzr info -v should say you have Branch format 5 and packs format 1. | 12:46 |
| mwhudson | oh yes, i meant to report that | 12:46 |
| mwhudson | (#177874) | 12:46 |
| abentley | This is happening when upgrading from knit to pack, right? Have you reconciled first? | 12:49 |
| abentley | that was to mwhudson | 12:49 |
| pitti | abentley: somewhere recently I read that we should upgrade first and reconcile afterwards | 12:50 |
| pitti | so I did that | 12:50 |
| abentley | pitti: that was to mwhudson, who is upgrading to rich-root-pack, rather than pack-0.92 | 12:50 |
| pitti | ah | 12:50 |
| mwhudson | abentley: i don't quite remember what i did, but yes, i think i reconciled first | 12:51 |
| abentley | pitti: The conversion is slightly different, because it needs to generate info for the rich roots. | 12:51 |
| mwhudson | abentley: i think it fails both for knits->packs->packs-rich-roots and knits->pack-rich-roots | 12:52 |
| mwhudson | abentley: but i was fighting this a while ago and got very confused | 12:52 |
| abentley | mwhudson: does cat-revision aaron.bentley@utoronto.ca-20070517163555-3i7jamitmffdg85l | 12:52 |
| abentley | succeed? | 12:52 |
| mwhudson | abentley: sorry, have to go now | 12:52 |
| abentley | mwhudson: anyhow, you probably don't want to be converting bzr.dev to rich-root-packs except for experimentation. | 12:55 |
| speakman | Anyone using bzr with Trac ? | 12:59 |
| abentley | Yes, but ugh. | 13:01 |
| speakman | ugh? | 13:01 |
| speakman | btw, I'm using your branch... | 13:01 |
| speakman | :) | 13:01 |
| abentley | Trac makes all kinds of assumptions about how data is stored that are wrong for bazaar. | 13:02 |
| abentley | Which forces bazaar to do expensive operations to answer queries that the user doesn't care about. | 13:02 |
| speakman | ok? | 13:03 |
| abentley | Which is to say that it's terribly slow. | 13:04 |
| speakman | okay, but it sure seems to work! | 13:04 |
| speakman | Except for my bugreport yesterday :) | 13:04 |
| abentley | I've given up on trac-bzr, and I don't read the bug reports. | 13:06 |
| speakman | I see. That's bad cause I do like Trac alot... | 13:08 |
| speakman | You don't see any way to integrate bzr into Trac? | 13:08 |
| abentley | I don't think it's worth it. You could build something much better than Trac with less effort. | 13:09 |
| abentley | Got to go. | 13:09 |
| speakman | Better Project manager? | 13:09 |
| speakman | Anyone using a similar project manager? | 13:14 |
| Solarion | wow I'm stupid | 13:25 |
| Solarion | FYI, bzr doesn't like it if you upgrade it while running it. :) | 13:26 |
| speakman | Btw, I was just telling about bzr to a friend who uses GIT for his work. | 13:36 |
| speakman | He wasn't very impressed, and one major thing, which I also noticed, is that bzr is veeeery slow sometimes. | 13:37 |
| speakman | All git-commands runs within a tenth of a second.. | 13:37 |
| speakman | What really is the "killer" feature to choose bzr before git? | 13:38 |
| mlh | ease of use | 13:38 |
| speakman | is it really easer? | 13:38 |
| jelmer | speakman: The very slow bit isn't as bad as it used to be | 13:39 |
| speakman | I have no practical experience with git, but it seems pretty the same... | 13:39 |
| mlh | that sort of thing is always a matter of opinion but I think most people would agree | 13:39 |
| jelmer | speakman: see also http://bazaar-vcs.org/BzrVsGit | 13:39 |
| speakman | jelmer: Thats maybe true, but some things still takes a pretty long time... | 13:39 |
| luks | it simply does more for you, so it takes longer :) | 13:40 |
| speakman | (why havn't I seen that link? I did google on bzr vs git...) | 13:40 |
| speakman | really? | 13:40 |
| jelmer | speakman, have you tested with bzr 1.0 and the packs format? | 13:40 |
| speakman | hm, what's packs format? | 13:42 |
| speakman | new feature in 1.0? | 13:42 |
| speakman | never seen it before... | 13:42 |
| speakman | How do i "convert" to Packs from Knit? | 13:47 |
| jelmer | bzr upgrade --pack-0.92 | 13:48 |
| speakman | hm what's default on 1.0 then? | 13:49 |
| TFKyle | pack-0.92 | 13:50 |
| speakman | ok! how can I determine which one my repo use currently? | 13:51 |
| TFKyle | bzr info -v should say | 13:51 |
| speakman | repository: Packs containing knits without subtree support | 13:52 |
| speakman | pretty abstract, but sure mentions packs.. :) | 13:52 |
| TFKyle | (also top line, says Standalone tree (format: pack-0.92) here) | 13:52 |
| speakman | oh! there it was! I was indeed "packs". | 13:54 |
| speakman | (I = it) | 13:54 |
| speakman | btw, what's the preffered web interface for bzr? | 13:54 |
| speakman | Are there anything like ViewRCS ? | 13:55 |
| speakman | And what's Bundle BuggY? :) | 13:55 |
| TFKyle | loggerhead seems pretty popular, havn't tried it myself though | 13:55 |
| TFKyle | (http://www.lag.net/loggerhead/ ) | 13:57 |
| speakman | thnks! | 13:59 |
| speakman | repository: Packs containing knits without subtree support | 13:59 |
| speakman | hm, paste button... :) | 13:59 |
| === per12345 is now known as cykze | ||
| cykze | Does anyone know how to make "bzr log" print the code diff for every commit/rev, just like "git-log -p" does? (btw, hi speakman! :)) | 14:05 |
| speakman | lol hi cykze ;) | 14:05 |
| speakman | Read the BzrVsGit ? | 14:07 |
| speakman | git indeed seems more powerful, but the "vs" do have some good points... | 14:07 |
| cykze | Yes, some days ago. I thought had too. | 14:08 |
| speakman | had? | 14:09 |
| cykze | forgot a "you" | 14:10 |
| speakman | Never seen it. Although my search for "bzr vs git" @ google. Was directed to it from here... :) | 14:10 |
| speakman | Found some speed benchmarks, but from some old version. | 14:11 |
| cykze | The only speed issue that bothers me is the 0.2 seconds it takes for eg. "bzr log" to startup. "git log" starts up in no time. | 14:26 |
| speakman | 0.2 secs is really slow... :) | 14:35 |
| speakman | I've filed a blueprint for the "git-log -p"-like request. | 14:36 |
| speakman | Time to go home now. Bye. :) | 14:36 |
| luks | revisions don't have diffs... | 14:39 |
| luks | I wonder what git-log -p outputs for revisions with multipe parents | 14:39 |
| cykze | Perhaps I have mixed up the terms "revision" and "commit". But "git-log -p" at least shows diffs where possible. | 14:42 |
| fullermd | Eh, git people always rebase. Multiple parents are a myth :p | 14:42 |
| cykze | luks: If I look at the Linux kernel repos using "git-log -p", then every commit seem to have diffs except for _merges_. Is that what you meant? | 14:47 |
| luks | yes | 14:48 |
| luks | but that's really not what I'd expect | 14:48 |
| cykze | So what did you expect? :) | 14:52 |
| luks | multiple diffs maybe | 14:52 |
| luks | or some multi-parent "hybrid", dunno | 14:52 |
| cykze | Perhaps you should check out the repos and have look for yourself, so that I'm not telling you anything here. I haven't used SCMs very long... | 14:56 |
| cykze | I think it's a very convenient way to get an overview of a new project and to see what has happened lately. I really miss that feature in bzr. | 15:00 |
| Alan_Bell | hi, I am a newbie with bzr, trying to get the ubuntu-desktop-course checked out. It sits and does nothing for ages then terminates wtih a memory error. Any clues? | 15:25 |
| Alan_Bell | alan@confluence:~$ bzr branch lp:ubuntu-desktop-course | 15:26 |
| Alan_Bell | lp:ubuntu-desktop-course is redirected to bzr+ssh://alan-dominux@bazaar.launchpad.net/~canonical-training/ubuntu-desktop-course/ubuntu-desktop-course-beta/ | 15:26 |
| Alan_Bell | Enter passphrase for key '/home/alan/.ssh/id_rsa': | 15:26 |
| Alan_Bell | bzr: ERROR: exceptions.MemoryError: | 15:26 |
| Alan_Bell | Traceback (most recent call last): | 15:26 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 802, in run_bzr_catch_errors | 15:26 |
| Alan_Bell | return run_bzr(argv) | 15:26 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 758, in run_bzr | 15:26 |
| Alan_Bell | ret = run(*run_argv) | 15:26 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 492, in run_argv_aliases | 15:26 |
| Alan_Bell | return self.run(**all_cmd_args) | 15:26 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 905, in run | 15:26 |
| Alan_Bell | possible_transports=[to_transport]) | 15:26 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/bzrdir.py", line 833, in sprout | 15:26 |
| Alan_Bell | revision_id=revision_id) | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/remote.py", line 601, in sprout | 15:27 |
| Alan_Bell | dest_repo.fetch(self, revision_id=revision_id) | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 873, in fetch | 15:27 |
| Alan_Bell | return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts) | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in write_locked | 15:27 |
| Alan_Bell | return unbound(self, *args, **kwargs) | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 2763, in fetch | 15:27 |
| Alan_Bell | pb=pb) | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 103, in __init__ | 15:27 |
| Alan_Bell | self.__fetch() | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 132, in __fetch | 15:27 |
| Alan_Bell | self._fetch_everything_for_revisions(revs, pp) | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 408, in _fetch_everything_for_revisions | 15:27 |
| Alan_Bell | self.to_repository.insert_data_stream(data_stream) | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 778, in insert_data_stream | 15:27 |
| Alan_Bell | for item_key, bytes in stream: | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/remote.py", line 863, in _deserialise_stream | 15:27 |
| Alan_Bell | buffer = StringIO(protocol.read_body_bytes()) | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/smart/protocol.py", line 549, in read_body_bytes | 15:27 |
| Alan_Bell | _body_decoder.accept_bytes(bytes) | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/smart/protocol.py", line 257, in accept_bytes | 15:27 |
| Alan_Bell | self.state_accept(bytes) | 15:27 |
| Alan_Bell | File "/usr/lib/python2.5/site-packages/bzrlib/smart/protocol.py", line 427, in _state_accept_reading_body | 15:27 |
| Alan_Bell | self._in_buffer += bytes | 15:27 |
| Alan_Bell | MemoryError | 15:27 |
| Alan_Bell | bzr 1.0.0 on python 2.5.1.final.0 (linux2) | 15:27 |
| Alan_Bell | arguments: ['/usr/bin/bzr', 'branch', 'lp:ubuntu-desktop-course'] | 15:27 |
| Alan_Bell | encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_GB.UTF-8' | 15:27 |
| Alan_Bell | plugins: | 15:27 |
| Alan_Bell | launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown] | 15:27 |
| Alan_Bell | multiparent /usr/lib/python2.5/site-packages/bzrlib/plugins/multiparent.pyc [unknown] | 15:27 |
| Alan_Bell | *** Bazaar has encountered an internal error. | 15:28 |
| Alan_Bell | Please report a bug at https://bugs.launchpad.net/bzr/+filebug | 15:28 |
| Alan_Bell | including this traceback, and a description of what you | 15:28 |
| Alan_Bell | were doing when the error occurred. | 15:28 |
| mwhudson | paaaaaaaaaaaaaaaaaastebin! | 15:34 |
| mwhudson | !paste | 15:34 |
| ubotu | pastebin is a service to post large texts so you don't flood the channel. The Ubuntu pastebin is at http://paste.ubuntu-nl.org (make sure you give us the URL for your paste - see also the #ubuntu channel topic) | 15:34 |
| mwhudson | Alan_Bell: please don't do that again :) | 15:34 |
| Alan_Bell | ok | 15:36 |
| Alan_Bell | any ideas why it has the memory error? | 15:36 |
| mwhudson | Alan_Bell: not immediately, no | 15:42 |
| sabdfl | Alan_Bell: interesting. it works fine for me, but i have 1.5gb RAM | 15:48 |
| matkor | Hi ! Is it possible to select one revision not usiing -r N..(N+1) ? | 15:52 |
| jelmer | matkor, a lot of commands support "-c" | 15:52 |
| jelmer | which allows you to do that | 15:52 |
| luks | -c is -r (N-1)..N | 15:54 |
| matkor | yop - thanks luks, jelmer | 15:55 |
| LeoNerd | Ahh... -c looks cute ;) | 15:55 |
| LeoNerd | bzr di -c 10 love it :) | 15:55 |
| matkor | and second question: Easiest way to revert selected files from given revision in past ? sth llike bzr revert -c N file1 file2 .. fileN ? TIA | 15:55 |
| jelmer | matkor: You'd want -r in that case | 15:56 |
| LeoNerd | Likely bzr revert -r | 15:56 |
| matkor | jelmer, LeoNerd: But I want all changes from all later revisions to stay ? | 15:58 |
| LeoNerd | Ah.. hrm.. | 15:58 |
| matkor | It is like patching with reverse patch but only applying selected files ... | 15:58 |
| LeoNerd | You want a bzr equivalent of baz replay --reverse patch-12 , say | 15:58 |
| jelmer | bzr merge -r N+1..N <files> | 15:59 |
| jelmer | I think | 15:59 |
| LeoNerd | Ooh yes.. a reversed merge | 16:00 |
| jelmer | although I guess it would make sense to support --reverse for replay | 16:00 |
| matkor | whoa, decresing revs range ... bzr is really pythonic :), thanks a lot ! | 16:01 |
| matkor | And really last question , is it prosible to grep text over past revisions ? I mean answering question - where given string was added/deleted in history of branch ? | 16:03 |
| jelmer | I think there was a grep plugin or something | 16:07 |
| Alan_Bell | sabdfl: I have 2 gig, just closed everything else running and I am trying again with verbose flag | 16:08 |
| aadis | hello all | 16:13 |
| aadis | can i tag individual files with tag command? or is it branch level only? | 16:13 |
| aadis | what does rich-root format do? | 16:36 |
| jelmer | aadis: it contains some extra metadata over the regular format | 16:37 |
| aadis | i'm setting up a shared repo on a central server | 16:37 |
| jelmer | aadis: it's required for the upcoming nested-tree-by-reference support and by bzr-svn | 16:37 |
| aadis | should i go for it? | 16:37 |
| jelmer | aadis: it will probably be the default format in the future, but it's not supported by bzr < 1.0 | 16:38 |
| aadis | that's not a problem for us actually | 16:38 |
| jelmer | aadis: I'd recommend rich-root-pack if you don't have to be compatible with bzr < 1.0 | 16:38 |
| aadis | rich-root-pack? | 16:39 |
| jelmer | yep | 16:39 |
| aadis | heh, i was going there too :) | 16:39 |
| jelmer | should be faster than rich-root | 16:39 |
| jelmer | perhaps we should have a wiki page or something with format recommendations | 16:39 |
| Alan_Bell | should bzr branch write files as it goes along. I have had it running for a couple of hours now, it is slowly consuming lots of memory (264MB so far) but has written no files apart from the directory and .bzr folder | 17:26 |
| Odd_Bloke | Alan_Bell: I would imagine it branches and then creates the working tree at the end. | 17:29 |
| Alan_Bell | last time I tried it hit a memory error, I have now freed up some extra ram for it. Is a 700MB tree unusually big? | 17:33 |
| Alan_Bell | having some success now, I stopped using lp:ubuntu-desktop-course and used | 18:08 |
| Alan_Bell | bzr branch http://bazaar.launchpad.net/~canonical-training/ubuntu-desktop-course/ubuntu-desktop-course-beta/ ubuntucourse | 18:08 |
| Alan_Bell | instead | 18:08 |
| Alan_Bell | that gave me the progress indicator and the .bzr directory is filling up with knits | 18:09 |
| jelmer | Alan_Bell, what version of bzr are you using? | 18:10 |
| Alan_Bell | 1.0 | 18:10 |
| jelmer | this would probably be faster with packs | 18:11 |
| Alan_Bell | to be more precise bzr 1.0.0 from the bzr repository for Ubuntu Gutsy on Python 2.5.1.final.0 | 18:16 |
| sabdfl | night all | 18:17 |
| oly- | hi, i am getting an error with bzr on 2 machines now on a commit and on a pull, an error about renaming a file the exact error is on this link http://paste.ubuntu-nl.org/49186/ | 18:37 |
| soren | oly-: You sure, there's not a stale lock around? | 18:41 |
| oly- | might be but i have no idea what one of those are :p | 18:42 |
| oly- | how do i check, | 18:43 |
| oly- | just googled it, well there should not be any bzr process running i switched of my work computer | 18:44 |
| oly- | and only just switched this on, so nothing should have a lock on the code repo | 18:44 |
| oly- | unless the launchpad server is still holding a lock, in which case can i force it any way ? | 18:45 |
| soren | oly-: bzr break-lock | 18:49 |
| soren | oly-: It'll ask for confirmation first. | 18:49 |
| oly- | cheers soren, that worked a treat | 18:51 |
| * soren ^5's himself | 19:03 | |
| === mw is now known as mw|travel | ||
| aadis | does bzr support UTF-8 for commit messages? | 19:12 |
| luks | it uses unicode for commit messages, and it will use whatever encoding you use | 19:12 |
| aadis | weird then | 19:13 |
| aadis | i know my editor (emacs22) is writing UTF-8 files. how do i tell bzr to use UTF-8? | 19:39 |
| Peng | aadis: Set your system charset to UTF-8. | 19:41 |
| aadis | it seems there is a specific issue on darwin | 19:41 |
| aadis | http://bazaar-vcs.org/DarwinCommandLineArgumentDecoding | 19:42 |
| Peng | Oh. | 19:42 |
| devinus | Does bazaar 1.0 support pushing changesets out using http? | 19:42 |
| Peng | http is read-only (of course), but I think bzr+http might support writing. | 19:46 |
| Peng | There's also an experimental webdav plugin. | 19:46 |
| pfharlock | Peng: just so I'm clear, what does bzr+http:// mean? | 20:15 |
| devinus | i wanna know too :( | 20:28 |
| devinus | man, i'm really trying to decide whether to use bzr, hg, or darcs for my companies VCS needs | 20:29 |
| devinus | but i can't see through all the buzzwords to see which one would suit us best | 20:29 |
| devinus | we like the idea of distributed | 20:30 |
| bitmonk | devinus: what sort of needs do you have? one reason i like bzr, though i haven't really switched to it for my own purposes, is that it supports pulling from svn masters, which is really useful if you want to collaborate with people who use sourceforge, googlecode, or run their own via a major linux distro. | 20:30 |
| * bitmonk still uses svn, but worked for a company who licensed bitkeeper for a year, and can sing the praises of distributed dev | 20:30 | |
| devinus | bitmonk: we use svn currently. we need it to have a central repository because we have programming teams in canada, texas, and now london. but i heard that bzr isn't good at pushing changesets to a central repo, and hg requires more steps than one to merge changes from a central repo, and darcs...well darcs is a haskell beast, and a few of us don't know haskell | 20:32 |
| bitmonk | hum. you could consider using a local bzr master at each location, or for each developer, and push up to an svn master.. that might be a bit tenuous, though.. | 20:33 |
| bitmonk | i don't know about the performance of various solutions for pushing to a central repo. bzr runs over http and maybe ssh. | 20:33 |
| bitmonk | how much code do you deal with? | 20:33 |
| fullermd | "isn't good at"? How? | 20:33 |
| devinus | we also use trac. maybe it's best if we just stick to svn | 20:33 |
| devinus | but damn i wish i could keep a local repo... | 20:33 |
| bitmonk | well, look at bzr-svn as a start. | 20:34 |
| bitmonk | i like it for the same reason, because i work in a large f/oss community that has svn and is not changing that any time soon. | 20:34 |
| devinus | bitmonk: huge 1000+ file PHP codebase, a new python codebase to scale into 500+ files, and maybe later some smaller C/C++ codebases | 20:34 |
| bitmonk | so, if i would get off my duff and change my workflow, i could benefit from bzr somewhat, while sending changes up to svn. | 20:34 |
| devinus | hrm... | 20:35 |
| * bitmonk is curious who devinus works for ;d | 20:35 | |
| devinus | we're just a travel company | 20:35 |
| * bitmonk nods | 20:36 | |
| devinus | use open source solutions for everything we can | 20:36 |
| bitmonk | well.. svn is very good at some things, esp on the server, but i don't know that it's really much better at them than bzr. | 20:36 |
| bitmonk | i haven't really figured out how to get bzr running on http yet | 20:36 |
| bitmonk | that's awesome, btw.. sound business sense. | 20:36 |
| * bitmonk is tired of hearing people in non-tech businesses call f/oss words like "cute" | 20:37 | |
| Peng | bitmonk: For read-only HTTP, all you need to do is push/branch to some HTTP-accessible location. That's it. | 20:38 |
| bitmonk | anyway, i suggest that as a first step you should look at the svn bridge, do some work in bzr, push it up to svn, see how that works for you. | 20:38 |
| devinus | bitmonk: good suggestion | 20:38 |
| bitmonk | Peng: that's my understanding, but i've had poor luck with that in the past and gave up. i should try again today. | 20:38 |
| bitmonk | devinus: at least that makes your question less academic, and you can show your colleagues what it's like. | 20:39 |
| Peng | bitmonk: Are you working on bzr+http, with the CGI script? | 20:39 |
| bitmonk | hold, sorry | 20:40 |
| bitmonk | someone at door :) | 20:40 |
| Peng | And he was never heard from again. :O | 20:40 |
| kakun- | butchered by a clearcase programmer | 20:41 |
| bitmonk | heh | 20:44 |
| Peng | Oh, good. | 20:44 |
| pfharlock | Peng: what is bzr+http? | 21:09 |
| pfharlock | incidentally, I'm also pretty stoked about bzr, however I ran into problems getting the bzr-svn plugin working on my windows workstation at work. Has anyone else had any luck with this that could give me a pointer or two. I'm sure it's something very simple that I'm missing. | 21:10 |
| jelmer | pfharlock, did you install the patched python subversion bindings? | 21:11 |
| pfharlock | I thought that I did, however bzr kept complaining that I hadn't, so I'm guessing I installed it wrong | 21:11 |
| Peng | pfharlock: bzr+http uses a CGI/FastCGI/whatever script on the server to be faster. | 21:11 |
| * fullermd sure will be glad when a svn release with all the updates is set free... | 21:11 | |
| pfharlock | is there something else you have to do other than run the python-svn-binding.exe setup file? | 21:13 |
| pfharlock | I butchered the name of the file | 21:13 |
| pfharlock | I made sure I had the appropriate version of svn installed and the appropriate version of python installed as well. | 21:14 |
| bitmonk | okay, so, whups, i had a meeting, but Peng, if you are still around, and want to help me understand how to use bzr on http, that'd be mucho appreciado. | 21:38 |
| bitmonk | and yeah, i know that's not a real word. ;) | 21:41 |
| jelmer | pfharlock: re | 21:43 |
| jelmer | pfharlock: but you have a patched version rather than a default svn intallation? | 21:43 |
| Peng | bitmonk: All you have to do is push (using sftp or bzr+ssh or whatever) to some HTTP-accessible location. That's all there is to it. | 21:48 |
| bitmonk | ok. | 21:48 |
| bitmonk | how does writable http work? | 21:48 |
| bitmonk | do i need to push, or would copying / moving a repo work? it shouldn't matter with distributed dev, ideally, but good to revisit assumptions. | 21:49 |
| bitmonk | maybe that's what i did wrong before? | 21:49 |
| Peng | bitmonk: I'm not sure about writable HTTP. | 21:50 |
| * bitmonk nods | 21:51 | |
| Peng | bitmonk: You could copy or move it too, but you don't need working trees, and pushing sets it up so they won't be created. | 21:51 |
| * bitmonk wrestles with python svn module | 21:53 | |
| * Peng bets $5 on the module. ;P | 21:58 | |
| bitmonk | yeah | 22:00 |
| * bitmonk thinks packages like svn who love python and thus put the bindings in the main distribution are bad santas. | 22:00 | |
| * bitmonk points, "bad santa! no cookies!" :-P | 22:01 | |
| * devinus me. | 22:05 | |
| === devinus is now known as devinus_ | ||
| === devinus_ is now known as devinus | ||
| * Peng pokes Enigmail. | 22:18 | |
| Peng | I swear I had signatures for some of the people on the bazaar list. | 22:18 |
| pfharlock | jelmer: I installed the default install then I installed the one that said python 2.5 bindings over top of that one | 22:27 |
| pfharlock | so in all two setup files | 22:27 |
| aadis_ | we're just going to start using bazaar for our company | 22:28 |
| aadis_ | after mucho delibration | 22:28 |
| pfharlock | yeah, unfortunately I don't think my team willi be able to switch to it from svn because of the way we use svn, but I'm thinking about using bazaar for individual projects and using the bzr-svn plugin to push and pull from our svn repo where it makes sense. | 22:32 |
| jelmer | luks: still there? | 23:48 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!