| systemclient | jelmer: thanks, I forgot the commit part … | 00:02 |
|---|---|---|
| bob2 | hah, awesome, google code is using dulwich for their git support | 00:06 |
| === medberry is now known as med_out | ||
| lifeless | bob2: interesting | 00:23 |
| kgoetz | jelmer: awesome. thakns for that (that being what you told systemclient) - i've been wondering that too | 00:56 |
| poolie | o/ thomi | 02:57 |
| RenatoSilva | is it possible to merge changes from a specific file? | 04:39 |
| RenatoSilva | of a different branch? | 04:40 |
| RenatoSilva | example branch 1 is a tree of dirs and files and one of them is foo. Branch 2 is contains only foo and I want to merge changes from branch 1, but only the foo file | 04:41 |
| === hunger_ is now known as hunger | ||
| Noldorin | hey jelmer | 07:29 |
| Noldorin | so co-located branches...what's the point? | 07:32 |
| jelmer | Noldorin: hi | 07:37 |
| jelmer | Noldorin: how do you mean? | 07:37 |
| Noldorin | jelmer, i mean i am quite happy (prefer?) having all my branches in separate dirs | 07:38 |
| Noldorin | is there any real reason to have co-located branches? | 07:38 |
| Noldorin | appart from Git interop | 07:38 |
| jelmer | Noldorin: you only need a single working tree for multiple branches | 07:41 |
| jelmer | which means less disk space, and potentially having to recompile fewer files if you're in a C project | 07:42 |
| Noldorin | jelmer, good point, i suppose. | 07:42 |
| Noldorin | jelmer, will bzr-git allow pushing to co-located branches from separate local branches though? | 07:43 |
| jelmer | Noldorin: sure | 07:58 |
| jelmer | 'morning Riddell | 07:58 |
| Noldorin | jelmer, oh great. :-) but that still requires bzr to get co-located brnaches support eh? | 07:58 |
| Riddell | morning | 08:00 |
| Riddell | I can't find my headphone/microphone :( | 08:00 |
| jelmer | Riddell: it looks like it's just the two of us today, don't hurry | 08:05 |
| Riddell | hmm, mumble freezes when I try to reconfigure it to my internal microphone | 08:06 |
| jelmer | Riddell: please ping when you're ready, I'm putting down my headset for a bit, not sure how much battery it still has left | 08:21 |
| jelmer | Riddell: we can also do skype if you prefer | 08:21 |
| Noldorin | jelmer, which version is it on the roadmap of bzr for anyway? | 08:21 |
| jelmer | Noldorin: probably 2.5 | 08:21 |
| jelmer | well, almost certainly 2.5 | 08:22 |
| Noldorin | jelmer, right, so i'll have everything i need then | 08:23 |
| Noldorin | i'm guessing that will happen by end of 2011? | 08:23 |
| jelmer | yeah, though the first 2.5 beta release is only a few months away | 08:24 |
| Noldorin | oh cool | 08:25 |
| Noldorin | and that will have co-located branches support in? | 08:25 |
| Noldorin | official bzr-git integration would be nice heh. | 08:25 |
| jelmer | Noldorin: official in what regard? what would that add? | 08:26 |
| Noldorin | jelmer, well bzr-svn is. it would make it easier for everyone to push to git without going through the installation process | 08:27 |
| Noldorin | saying that however... | 08:27 |
| Noldorin | since bzr-windows got the site-packages/ dir everything is MUCH easier | 08:27 |
| jelmer | Noldorin: bzr-svn is no more official than bzr-git | 08:28 |
| jelmer | (or less official) | 08:28 |
| jelmer | do you mean inclusion in the windows installer? | 08:28 |
| Noldorin | jelmer, well official in the sense that it's included as standard with bzr installations | 08:28 |
| jelmer | Noldorin: That's only really relevant for the windows installer | 08:30 |
| jelmer | Noldorin: Once the kinks with running bzr-git on windows are ironed out, I think it would be a good idea to propose it for inclusion in the windows installer. | 08:31 |
| Riddell | jelmer: let's do skype, I'm jriddell | 08:32 |
| Noldorin | jelmer, oh right, i see now | 08:32 |
| Noldorin | jelmer, that's good to know. :-) | 08:32 |
| Noldorin | jelmer, btw sorry i haven't had much time...will be looking into that issue i'm having soon | 08:33 |
| jelmer | Noldorin: in that regard, it would also be useful if you can write down your experiences so the bzr-windows-installer folks can use them when adding bzr-git support | 08:33 |
| Noldorin | jelmer, definitely. will do that blog post once all is working. remind me if i forget :-) | 08:34 |
| Riddell | jelmer: bug 816376 | 08:37 |
| ubot5 | Launchpad bug 816376 in bzr-builddeb "bzr bd-do for full source packages" [Low,Triaged] https://launchpad.net/bugs/816376 | 08:37 |
| Riddell | https://code.launchpad.net/~jr/qbzr/785967-ghost-revisions-in-qlog/+merge/69798 | 08:44 |
| maxb | jelmer: fyi a retry of that bzr-svn 'lost connection' build succeeded. So now all I have to do is backport debhelper 8.1.0 to <<natty, and the beta ppa should be in sync with sid | 08:50 |
| maxb | oh, no, I forgot the bzr-builddeb fail | 08:50 |
| jelmer | maxb: which fail? | 08:51 |
| jelmer | missing python-lzma? | 08:52 |
| maxb | bzr-builddeb 2.7.7 FTBFS on <= maverick due to test failures due to missing pristine-tar lzma support. | 08:52 |
| maxb | is what I wrote down about it when investigated | 08:52 |
| maxb | *ing | 08:52 |
| maxb | Should just be a matter of guarding tests with an appropriate feature, I hope | 08:53 |
| jelmer | hmm, hanging up skype calls with "pkill -9 skype" is sort of suboptimal | 08:53 |
| jelmer | maxb: pristine-tar doesn't have lzma support nowadays either | 08:54 |
| jelmer | though it may have some way of dealing with unknown formats (such as lzma) | 08:54 |
| bigjools | guys, is there a way to remove orphan revisions in a shared repo? | 09:54 |
| jelmer | bigjools: not really, there are plans for a "bzr gc" command. Until then, the best way is to create a new shared repo and cloning the branches you care about into that. | 09:58 |
| bigjools | jelmer: ok thanks | 09:58 |
| bigjools | I think that's what I did last time :) | 09:59 |
| jelmer | Riddell: did you still need a review of that qbzr branch? | 10:06 |
| jelmer | I can't find it in the +activereviews queue | 10:06 |
| Riddell | jelmer: no alex did it | 10:06 |
| lifeless | jelmer: hi | 10:06 |
| lifeless | https://launchpad.net/bugs/819604 | 10:06 |
| ubot5 | Ubuntu bug 819604 in Bazaar "when an idle ssh transport is interrupted, bzrlib errors" [Undecided,New] | 10:06 |
| lifeless | ok, internet fail | 10:07 |
| jelmer | Riddell: cool | 10:07 |
| lifeless | jelmer: hi | 10:07 |
| lifeless | https://launchpad.net/bugs/819604 | 10:07 |
| jelmer | lifeless: thanks though, I got the bug # | 10:07 |
| lifeless | jelmer: any chance that can get prioritised ? | 10:43 |
| jelmer | lifeless: yep | 10:46 |
| jelmer | (wrapping up some Launchpad QA at the moment, but I'm following what's happening on -ops) | 10:46 |
| lifeless | jelmer: awesome, cool | 10:52 |
| Riddell | would be good to have a review of this https://code.launchpad.net/~jr/bzr-explorer/814408-lock-contention/+merge/69653 | 12:51 |
| * jelmer looks | 13:00 | |
| exarkun | What's going on here? $ bzr branch dummy a | 13:06 |
| exarkun | bzr: ERROR: The branch dummy has no revision None. | 13:06 |
| exarkun | Hmmmmmm | 13:07 |
| exarkun | Something about shared repositories | 13:07 |
| jelmer | exarkun: branch moved out of a shared repo manually? | 13:20 |
| jelmer | hey mwhudson | 13:21 |
| exarkun | Yes, that was it | 13:21 |
| mwhudson | jelmer: hello | 13:21 |
| jelmer | mwhudson: you're up late :) | 13:21 |
| mwhudson | jelmer: i'm in the uk :) | 13:21 |
| jelmer | Riddell: reviewed; I'm not sure about what the right thing is to do when refresh() is hit instead. | 13:21 |
| jelmer | Riddell: what do you think? | 13:22 |
| jelmer | mwhudson: ahh | 13:22 |
| Riddell | jelmer: I'm not sure we have better options, on the other hand I don't think it happens much, this is a long standing problem but people only noticed it when I added the auto-refresh feature | 13:29 |
| === mrevell__ is now known as mrevell | ||
| jelmer | Riddell: ah | 13:44 |
| jelmer | Riddell: for auto-refresh I certainly think it makes sense to silently ignore lock retention problems | 13:45 |
| Riddell | where would be the best place to put out a notice about bug 814408 ? I think it's important enough to notify the bzr explorer packagers | 14:19 |
| ubot5 | Launchpad bug 814408 in Bazaar Explorer "Exception "bzr: ERROR: Could not acquire lock" occurs very often. " [High,Fix released] https://launchpad.net/bugs/814408 | 14:19 |
| Riddell | on the qbzr mailing list? | 14:19 |
| jelmer | Riddell: there is also a bzr-packagers list, that might be most appropriate if you want to inform the packagers | 14:22 |
| Riddell | so there is | 14:25 |
| Riddell | if I have a trivial change to bzr that doesn't need approval what's the easiest way to get it into trunk? | 14:54 |
| Riddell | do I have to do a merge proposal and self approve and send to pqm? | 14:54 |
| mgz | that's what I generally do. | 14:55 |
| mgz | I find pushing lp:~gz/bzr/trivial_whatever and proposing, accepting, and running feed-pqm is easy enough I've never looked into the hydrazine bypassing methods | 14:56 |
| henninge | Hi! | 14:56 |
| henninge | How do I fix a pipeline after I removed a pipe (not remove-pipe but removed the directory) ? | 14:57 |
| henninge | I now get "Not a branch: " errors when I do a show-pipeline. | 14:58 |
| mgz | no idea, I'll try searching the mailing list archives | 15:02 |
| jelmer | abentley: ^ | 15:06 |
| abentley | henninge: You edit .bzr/branch/branch.conf in the neighbouring pipes to remove references to the missing pipe. | 15:07 |
| henninge | abentley: thanks! | 15:09 |
| abentley | henninge: if the pipe was in the middle, you'll need to fix the remaining pipes to point to each other, or else you'll have two disconnected pipelines. | 15:10 |
| henninge | it was at the end but thanks | 15:10 |
| abentley | henninge: were you deliberately avoiding remove-pipe? | 15:11 |
| henninge | no, I was cleaning out unsused branches from my repository and forgot that this one was part of a pipeline. | 15:12 |
| henninge | abentley: now that you mention it, I don't think remove-pipe --branch ever worked for me - the branch always remained. | 15:13 |
| abentley | henninge: Odd. I don't use it much, but I'll check it. | 15:13 |
| henninge | abentley: worked now. Dunno what I was remembering there ... | 15:18 |
| abentley | henninge: Cool. I imagine you'd still prefer if there was a "repair" command? | 15:19 |
| mwhudson_ | if i want to list the files in a directory in a tree, what's the easiest api to use? list_files(recursive=False)? | 15:22 |
| mwhudson_ | there is also iter_children | 15:22 |
| henninge | abentley: yes, that is really missing. | 15:37 |
| abentley | mwhudson_: I would say list_files(recursive=False) | 15:37 |
| mwhudson_ | abentley: ta | 15:37 |
| === beuno is now known as beuno-lunch | ||
| === beuno-lunch is now known as beuno | ||
| exarkun | I want to try the bzr beta but apt wants to uninstall bzr-svn in order to upgrade to bzr from the beta ppa | 18:18 |
| exarkun | just a fact of life? or what? | 18:24 |
| exarkun | okay, out of time. filed https://bugs.launchpad.net/bzr/+bug/819964 sort of relatedly. | 18:27 |
| ubot5 | Ubuntu bug 819964 in Bazaar "bzr: ERROR: No such file: .../.bzr/repository/indices/...rix" [Undecided,New] | 18:27 |
| ablmf333 | I tried to use bzr to merge 2 svn branches. And something went wrong. Now I can't use "bzr branch/checkout" to get a new copy from svn. | 19:38 |
| ablmf333 | The error is : InvalidBzrSvnRevision: Revision id xxx@gmail.com-20110801193839-e85w184hqg35dxjy was added incorrectly | 19:39 |
| ablmf333 | Is there any way to clean up bzr's local cache of svn and let me get a fresh new checkout from svn? | 19:40 |
| ablmf333 | nvm, I found it. | 19:58 |
| === med_out is now known as med | ||
| === med is now known as medberry | ||
| === yofel_ is now known as yofel | ||
| SpamapS | I'm having trouble with bzr import-dsc in Oneiric.. http://paste.ubuntu.com/657500/ | 21:14 |
| krow | Are nested repositories (i.e. hg sub repositories) working at this point? The website is confusing on this point. | 21:19 |
| thumper | krow: I don't think they are | 21:27 |
| RenatoSilva | is it possible to merge a single file? | 21:36 |
| AnAnt | Hello, I lost a couple of .pack files, how can I fetch them from repository ? | 21:39 |
| systemclient | is it a problem if I use bzr 2.1.2 (debian stable) on Branches created with 2.3.1 (ubuntu natty)? | 21:44 |
| beuno | systemclient, no, it should be fine | 21:44 |
| systemclient | beuno: where can I find the striking differences between the version? | 21:45 |
| beuno | systemclient, not sure, but in the source tree, the NEWS file keeps track of all the changes | 21:46 |
| beuno | too fine-grained for what you're looking for, I'm sure | 21:47 |
| systemclient | beuno: I just care for my commits to be safe, that is all | 21:47 |
| beuno | systemclient, there haven't been any format changes since 2.0, so you can safely use those 2 versions | 21:47 |
| beuno | and even if there are format changes, nothing will break | 21:47 |
| systemclient | beuno: even going down? | 21:48 |
| beuno | systemclient, yeap, bzr won't break things. Ever. | 21:48 |
| systemclient | beuno: +1 for bazaar then! | 21:48 |
| systemclient | it would be intersting if git behaves the same way | 21:48 |
| systemclient | so bzr would just say "I do not know this typo of repo, exiting"? | 21:49 |
| jelmer | systemclient: yeah | 22:08 |
| === medberry is now known as med_brb | ||
| === med_brb is now known as med | ||
| === med is now known as medberry | ||
| poolie | hi all | 23:42 |
| poolie | hi jelmer? | 23:42 |
| jelmer | hi poolie | 23:50 |
| poolie | hi there | 23:54 |
| RenatoSilva | ~offtopic: how can this *diff between pacthes* result in *the same* patched file? http://pastie.org/pastes/2311489/text | 23:56 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!