| poolie | thumper: yes | 00:15 |
|---|---|---|
| poolie | working on ppa now | 00:19 |
| ubotu | New bug: #209450 in bzr "The error message for "can't find bzr on remote server" when using bzr+ssh is now scary." [Undecided,New] https://launchpad.net/bugs/209450 | 00:20 |
| spiv | bob2: thanks | 00:21 |
| bob2 | I was a bit suspicious of r3313, but reverting to 3312 didn't help | 00:23 |
| spiv | bob2: I'd probably be suspicious of 3309 | 00:24 |
| ubotu | New bug: #209458 in bzr-loom "combine-thread doesn't result in correct tree parents" [Undecided,New] https://launchpad.net/bugs/209458 | 00:41 |
| poolie | vila, what is ~bzr-upload-devs? | 01:06 |
| lifeless | There will be a short interruption to bazaar.launchpad.net and the ubuntu wiki to deploy a fix for the performance problems. | 01:49 |
| uniscript | how do I push a branch into a new svn: repository branch? | 02:47 |
| spiv | uniscript: I use "svn cp" to make the branch in the repo, then "bzr push" to that | 02:50 |
| uniscript | but bzr push says I have to merge | 02:50 |
| spiv | uniscript: there's a bzr-svn bug (https://bugs.launchpad.net/bzr-svn/+bug/203368) you can hit if you do it directly | 02:50 |
| ubotu | Launchpad bug 203368 in bzr-svn "svn-push a branch with no new history makes surprising commit to SVN repo" [Wishlist,Confirmed] | 02:50 |
| spiv | Hmm, I'm not sure why that would be. Perhaps you did "svn cp" from a different revision of the source branch? | 02:51 |
| uniscript | I should explain I branched an svn: repo from repo1 but want to push up to an empty dir on repo2 | 02:51 |
| spiv | Oh. | 02:51 |
| spiv | I don't know much about different SVN repositories. | 02:51 |
| uniscript | any suggestions on how I can achieve this? | 02:51 |
| spiv | Or rather, about using bzr-svn with them. | 02:52 |
| spiv | It's not something that SVN is really designed to support, so I'd expect bzr-svn to struggle with it too. | 02:52 |
| spiv | But if you mail the bazaar list, Jelmer might be able to help. | 02:53 |
| uniscript | does that mean I have to join another list :( | 02:54 |
| spiv | You could mail Jelmer directly, I guess (I think his address is in the bzr-svn README file), but I think the list is a better forum, so other people can help and/or learn from the post. | 02:55 |
| spiv | uniscript: you could join the list, but then set your mailman settings to disable mail delivery. That way you can post unmoderated, but you won't get a flood of messages to your inbox. | 02:56 |
| uniscript | err where is the mailing list? Can't find it on launchpad :( | 03:01 |
| ubotu | New bug: #209490 in bzr-loom "bzr-loom does not make it obvious when to use "bzr record"" [Undecided,New] https://launchpad.net/bugs/209490 | 03:01 |
| spiv | uniscript: https://lists.ubuntu.com/mailman/listinfo/bazaar | 03:01 |
| spiv | uniscript: (it's linked from http://www.bazaar-vcs.org/) | 03:02 |
| uniscript | sorry, just being frustrated with launchpad. Never seem to be able to find what I want there | 03:02 |
| uniscript | the classic is: this package keeps it's bug tracking somewhere else, but doesn't say where that somewhere else is | 03:03 |
| awmcclain | How would I ignore a file ".foo" in every directory of my branch? | 03:46 |
| lifeless | bzr ignore **/.foo | 03:48 |
| lifeless | probably quoted: bzr ignore '**/.foo' | 03:48 |
| awmcclain | Thank you! | 03:50 |
| Verterok | lifeless: hi | 03:53 |
| awmcclain | If i merge a branch, does the .bzrignore file merge as well? | 03:53 |
| lifeless | awmcclain: yes | 03:53 |
| lifeless | Verterok: hi | 03:53 |
| awmcclain | No reason it wouldn't. | 03:53 |
| awmcclain | Great. | 03:53 |
| Verterok | lifeless: do you have time for a quick question about my patch for custom properties in log? | 03:54 |
| lifeless | sure | 03:54 |
| Verterok | I not sure what I should fix in the docstrings of the show_properties method | 03:54 |
| Verterok | the gmane thread is: http://thread.gmane.org/gmane.comp.version-control.bazaar-ng.general/38101 | 03:54 |
| Verterok | lifeless: I already added the tests for error case and added error handling code in the show_properties method | 03:56 |
| awmcclain | Is "no handlers could be found for logger "bzr" a bzr message? | 03:56 |
| lifeless | awmcclain: its coming from pythons logging framework | 03:58 |
| lifeless | awmcclain: are you using the bzr frontend or some other script ? | 03:58 |
| awmcclain | lifeless: I'm running bzr automatically from capistrano. | 03:58 |
| awmcclain | Maybe I have an unmet dependency on the box? | 03:58 |
| lifeless | awmcclain: no sure; whats capistrano ? | 04:03 |
| awmcclain | lifeless: A nifty automated deployment framework. Basically I'm sshing into a minimally configured ubuntu box and running bzr up --lightweight, and I'm getting back that message (everything is working though) | 04:04 |
| lifeless | hmm, could be a missing thing I guess | 04:04 |
| lifeless | please file a bug, for extra credit with how-to-reproduce | 04:05 |
| awmcclain | lifeless: Okee doke. I've read on launchpad that it may be related to a lock file? Could that be? | 04:05 |
| lifeless | doubt it | 04:05 |
| awmcclain | Yeah, me too. | 04:05 |
| awmcclain | Sounds like a dependency thing. | 04:06 |
| lifeless | I'd guess race condition with the logging infrastructure setup | 04:06 |
| awmcclain | lemme try logging in directly | 04:06 |
| awmcclain | and see | 04:06 |
| awmcclain | lifeless: Ok, it's not a capistrano thing. | 04:10 |
| jamesh | lifeless: I had a bit of a play with bzr-loom. It is quite useful, although the UI doesn't quite feel right | 04:11 |
| lifeless | jamesh: I saw your bug - thanks. | 04:11 |
| jamesh | perhaps that's just because I'm not used to it yet | 04:11 |
| jamesh | lifeless: is there any reason why the unrecorded loom state is in the branch rather than working tree? | 04:12 |
| lifeless | jamesh: yes, its branch related not tree related | 04:16 |
| jamesh | lifeless: I guess I'd see the last recorded loom state as being branch related, but the unrecorded state as working tree related. | 04:16 |
| abentley | awmcclain: Not lock file, log file. | 04:18 |
| abentley | You probably don't have permission to write ~/.bzr.log | 04:18 |
| awmcclain | abentley: Actually, I was talking about lock, as described here: https://answers.launchpad.net/bzr/+question/19988 | 04:19 |
| awmcclain | abentley: That's exactly it. The .bzr.log file is owned by root! | 04:21 |
| abentley | Happy to help. | 04:21 |
| awmcclain | Must be because the first time I run bzr I sudo? | 04:21 |
| awmcclain | hrmmm | 04:21 |
| awmcclain | I suppose I could just touch .bzr.log before I start. | 04:22 |
| awmcclain | Yay! | 04:22 |
| Peng | jelmer: Should I back up .bazaar/subversion.conf? If it's lost, will I have to fix the branching scheme next time I pull or something? What if I keep subversion.conf but svn-cache gets deleted? | 05:54 |
| mdke | anyone understand this? http://pastebin.ubuntu.com/6253/ | 08:21 |
| bob2 | ubuntudoc was converted from svn | 08:23 |
| bob2 | so needs to be branched into a "rich-root"-supporting repository | 08:23 |
| bob2 | alas bzr co doesn't realise that | 08:23 |
| mdke | you mean that the downloader has got a shared repository set up there with a different format? | 08:24 |
| bob2 | no, bzr co defaults to one that doesn't support rich-root | 08:24 |
| mdke | hmm. | 08:24 |
| mdke | is rich-root the same as "dirstate-with-subtree"? | 08:25 |
| mdke | that's the one we have | 08:25 |
| bob2 | afaik the work around is "bzr init-repo --rich-root-pack ubuntu-doc ; bzr co http://launchpad-asdjfhsaldfhas/trunk ubuntu-doc/trunk" or similar | 08:25 |
| spiv | rich-root is a feature some formats support. | 08:25 |
| === mwhudson__ is now known as mwhudson | ||
| mdke | spiv: and dirstate-with-subtree supports it? | 08:26 |
| spiv | dirstate-with-subtree is one format that supports that (and also some experimental feature); rich-root-pack is the newest and best format for rich-root support. | 08:26 |
| mdke | is there a converting tool between the two? | 08:27 |
| jamesh | "bzr upgrade"? | 08:27 |
| bob2 | bzr upgrade will convery branches | 08:27 |
| bob2 | but that doesn't help that person | 08:27 |
| mdke | I tried that, it failed and trashed my branch | 08:27 |
| spiv | And you can generally "bzr pull" etc revisions into a compatible repository. | 08:27 |
| mdke | I couldn't even restore the backup | 08:27 |
| mdke | I should have written down the error | 08:28 |
| bob2 | that's quite bad, since the backup is done by more or less "cp -r" | 08:28 |
| bob2 | or was it mv | 08:28 |
| mdke | I wonder if I was trying to restore it to the wrong place, I had a shared repo at the time | 08:29 |
| spiv | bob2: there's a bug in upgrade in some situations involving shared repos | 08:29 |
| bob2 | ah | 08:29 |
| mdke | double ah | 08:29 |
| spiv | bob2: that can leave things in a busted (but recoverable by hand) state | 08:29 |
| mdke | anyway, I don't think the upgrade worked | 08:30 |
| spiv | There's a bug report about that somewhere. lifeless knows the full details. | 08:30 |
| Peng | .bzr/repository is renamed to .bzr/repository.backup or something, and there is no new .bzr/repository. It's entirely safe to just rename it back in that case. | 08:31 |
| mdke | I'm definitely interested in trying to convert these branches to the "official" bzr format though | 08:31 |
| Peng | You could've experienced another problem, of course. | 08:31 |
| mdke | if it's possible, i would like to do it | 08:31 |
| Peng | mdke: Rich roots are The Future. | 08:31 |
| jamesh | the problem is that they aren't The Present. | 08:32 |
| Peng | mdke: And converting from rich roots to non-rich roots is not supported, because that would throw away certain meta data. | 08:32 |
| Peng | jamesh: Heh. | 08:32 |
| spiv | mdke: you can do the upgrade manually, by doing "bzr init-repo --rich-root-format new-repo", and then manually "bzr branch"ing each branch from the old to the new, then renaming the repos "mv repo old-repo; mv new-repo repo". | 08:32 |
| mdke | what is The Present? | 08:33 |
| Peng | spiv: "--rich-root-pack", not "--rich-root-format" | 08:33 |
| Peng | mdke: Non-rich roots. | 08:33 |
| spiv | Peng: right, thanks. That's what I get for typing commands direct into IRC :) | 08:33 |
| Peng | :) | 08:33 |
| mdke | I understood that the format we have now is not the best format at the present | 08:33 |
| Peng | Indeed. | 08:34 |
| spiv | (and maybe you need to do "bzr init" + "bzr pull" instead of "bzr branch" for subtree -> rich-rich, I forget) | 08:34 |
| * Peng shrugs. | 08:34 | |
| Peng | I don't know that. | 08:34 |
| mdke | spiv: I will save those commands and give them a try later on | 08:34 |
| Peng | Um. | 08:34 |
| mdke | spiv: thanks | 08:34 |
| Peng | I did something like that recently. | 08:34 |
| mdke | I think we'd be content with trying to get up to The Present | 08:35 |
| spiv | (https://bugs.launchpad.net/bzr/+bug/145812 appears to be the bug I mentioned earlier, btw) | 08:35 |
| ubotu | Launchpad bug 145812 in bzr "Upgrade can leave a broken repository (with backup)" [Low,Triaged] | 08:35 |
| Peng | Right. | 08:35 |
| Peng | I bzr branched from dirstate-with-subtree to rich-root-pack, and it worked, but it was ridiculously slow. | 08:35 |
| mdke | I'm patient :) | 08:36 |
| Peng | Haha. | 08:36 |
| Peng | It took 5.5 hours for a ~1300 revision, ~200 MB repo. | 08:37 |
| mdke | ah, overnight then | 08:37 |
| Peng | That was over bzr+ssh over the Internet.. | 08:38 |
| Peng | Doing it locally would be faster, of course. | 08:38 |
| Peng | But there's no way it should take nearly that long. | 08:38 |
| mdke | that's fine. If it's the right thing to do, I'm happy to wait :) | 08:39 |
| mdke | bbias | 08:40 |
| Peng | mdke: Going from subtrees to rich roots is safe in many situations (subtree support more features, but if they're not being used), but it's not possible to go from rich roots to non-rich roots without losing some meta data. | 08:44 |
| mdke | Peng: does one want to go from rich roots to non-rich roots? | 08:46 |
| mdke | I just want to go to the best current supported format | 08:46 |
| Peng | mdke: There's not much need. | 08:49 |
| Peng | mdke: The only problem is that the default format does not support rich roots, so users can get confusing errors when doing "bzr init-repo" and then trying to branch a rich root branch into it, and that "bzr checkout" problem. | 08:50 |
| mdke | Peng: could I upgrade to the "default format" instead? | 08:51 |
| mdke | that would still be faster than the current one, right? | 08:52 |
| === doko_ is now known as doko | ||
| Peng | mdke: Current one? | 08:52 |
| mdke | the dirstate-with-subtree format | 08:52 |
| Peng | mdke: Oh. | 08:52 |
| Peng | mdke: Like I said, you can probably go from dirstate-with-subtree to rich-root-pack, but not to a non-rich-root format. | 08:53 |
| Peng | Mmm, netsplit. | 08:57 |
| mdke | lagged out, sorry | 08:57 |
| mdke | last thing I have was the "isn't it a bit odd" question | 08:58 |
| mdke | anyway, got to go to work now. thanks all for the info | 08:59 |
| Peng | "isn't it a bit odd"? | 09:02 |
| Peng | I didn't get that. | 09:02 |
| ubotu | New bug: #209570 in bzr "http cannot tunnel smart protocol" [Critical,New] https://launchpad.net/bugs/209570 | 09:16 |
| thekorn | hi, does the bzr extension for nautilus from bzr-gtk work for anyone? | 09:40 |
| james_w | hi thekorn | 09:40 |
| thekorn | hi james_w | 09:40 |
| james_w | I heard someone saying the other day that it didn't work for them | 09:40 |
| james_w | so it sounds like their may well be a regression there. | 09:40 |
| thekorn | hmm, the python bindings for nautilus does not seem to work at all, so there might be the problem | 09:41 |
| james_w | ah, you're just trying from a python console? | 09:42 |
| thekorn | no, within nautilus, no clue howto test it in a console-session | 09:43 |
| thekorn | it's bug http://bugzilla.gnome.org/show_bug.cgi?id=518824 | 09:43 |
| james_w | thekorn: thanks, I'll open a bug in Ubuntu | 09:45 |
| thekorn | james_w, okay, thanks, can you please subscribe me? :) | 09:47 |
| james_w | done | 09:48 |
| james_w | do you want to use your bugcontrol powers on it? | 09:48 |
| james_w | https://bugs.launchpad.net/nautilus-python/+bug/209580 | 09:48 |
| ubotu | Launchpad bug 209580 in nautilus-python "python-nautilus doesn't work with latest nautilus" [Undecided,New] | 09:48 |
| thekorn | james_w, yes, will set the importance to medium | 09:51 |
| james_w | isn't it critical for that package if it doesn't work at all, or do I misunderstand? | 09:53 |
| thekorn | james_w, critical for this package, but not for ubuntu, as the number of users affected by this is not that big, I think | 09:56 |
| james_w | ah, ok. I thought the severity was per package | 09:57 |
| james_w | should there be a split for the severity against the package and severity for the release? | 09:58 |
| thekorn | I'm not sure, maybe the gnome bug needs a higher severity, | 10:01 |
| james_w | it's critical I think | 10:02 |
| james_w | I looked again and found an existing bug for this, so I've duped it | 10:02 |
| thekorn | james_w, I've no clue about FFe and the related process, I will discuss this bugreport with people in #ubuntu-bugs later today | 10:05 |
| james_w | I don't think we need an FFe to fix this, I'm not sure though. | 10:06 |
| james_w | there's a workaround patch described in the bug report, we can add that to the package for the release I think | 10:06 |
| ubotu | New bug: #209580 in nautilus-python "python-nautilus doesn't work with latest nautilus (dup-of: 44704)" [Medium,Confirmed] https://launchpad.net/bugs/209580 | 10:07 |
| pbor | I know I asked this before, but I can't remember how to do it... can I make bzr diff --diff-options=-p the default for bzr diff? | 11:25 |
| dato | pbor: yes, with an alias | 11:26 |
| pbor | ah, ok | 11:26 |
| pbor | I thought there was some way inside bzr | 11:26 |
| dato | a bzr alias, not a shell alias, I mean | 11:26 |
| pbor | ah | 11:26 |
| * pbor looks that up | 11:26 | |
| pbor | thanks dato | 11:27 |
| pbor | is bzr alias a plugin? | 11:28 |
| pbor | bzr help alias gives me an error | 11:28 |
| dato | nope, it's core | 11:28 |
| dato | but | 11:28 |
| dato | I don't know if you can add an alias from the command line, with a command | 11:28 |
| dato | I *think* you have to edit the configuration file | 11:28 |
| james_w | no, you can't | 11:28 |
| james_w | thumper proposed a patch to do that, but I don't know what happened to it | 11:29 |
| dato | pbor: so, like this: | 11:29 |
| dato | % head -n 2 ~/.bazaar/bazaar.conf | 11:29 |
| dato | [ALIASES] | 11:29 |
| dato | up = update | 11:29 |
| pbor | ah, ok, I can live with that :) | 11:29 |
| pbor | thanks | 11:29 |
| james_w | I think there was discussion about whether it should work like the shell builtin alias, or more like bzr in terms of command line parsing | 11:29 |
| frsk | Why have you aliased update? =) | 11:29 |
| frsk | bzr up = bzr update with aliasing it :) | 11:30 |
| frsk | without* | 11:30 |
| dato | frsk: I probably added it when the "up" alias didn't exist in core | 11:30 |
| dato | and didn't clean up afterwards | 11:30 |
| frsk | dato: Aha | 11:30 |
| Stavros | hello | 11:55 |
| Stavros | i need to pull the changes from a remote repository up to and including a tagged release, and substitute all my local working copy with that release. what is the correct command line? | 11:56 |
| dato | Stavros: do you have local commits_ | 11:56 |
| dato | ? | 11:56 |
| Stavros | dato: no, it's a production server | 11:57 |
| Stavros | i may have some local edits which i want overwritten | 11:57 |
| dato | aha. so, `bzr revert && bzr pull -r tag:TAGNAME http://...` ? | 11:57 |
| Stavros | aha, that should work, let me try it | 11:58 |
| Stavros | do i need to do something like "revert -r"? | 11:58 |
| Stavros | oh wait, nm :/ | 11:58 |
| dato | no, you don't | 11:58 |
| Stavros | how about pull --overwrite? | 11:58 |
| dato | that's for when you have local commits | 11:59 |
| Stavros | ah | 11:59 |
| Stavros | but not local working copy changes? | 11:59 |
| dato | nope | 11:59 |
| dato | those are reverted with revert | 11:59 |
| Stavros | hmm, it said something about conflicting tags... | 12:00 |
| Stavros | aw man, i'm in the front page of reddit | 12:03 |
| Stavros | no wonder the server is hammered | 12:03 |
| TFKyle | Stavros: which, learn python in 10 minutes? | 12:05 |
| Stavros | yeah :/ | 12:05 |
| Stavros | so, any idea what this talk about "conflicting tags" is? | 12:08 |
| james_w | Stavros: there is a tag that is set to one revision in your branch and another revision in the other branch | 12:08 |
| james_w | or two tags with the same name on two different revisions if you like | 12:09 |
| Stavros | james_w: that's odd, don't tags get moved if they already exist? | 12:09 |
| james_w | Stavros: I think so, what does the rest of the message say? | 12:09 |
| Stavros | it just shows me the tag I just set | 12:09 |
| james_w | does it stop the pull, or just warn you? | 12:09 |
| Stavros | it just warns me, from what i can see | 12:09 |
| james_w | does it say which one was kept? | 12:09 |
| james_w | i.e. did it keep your tag, or use the other one? | 12:10 |
| Stavros | no, but apparently the server has it on a different release than on my machine | 12:10 |
| Stavros | that's odd | 12:10 |
| Stavros | i have it on 247 and the server on 246 | 12:10 |
| Stavros | shouldn't it update the tag on pull, even though it already is on a revision on the server? | 12:14 |
| Stavros | hmm, --overwrite works | 12:15 |
| james_w | yep, it's a conflict, so you need to specify what you want to happen | 12:17 |
| Stavros | ah | 12:19 |
| Stavros | hmm, why does it not update? because i set it on the server? | 12:19 |
| james_w | yes, the tag points to two different places, and so bzr doesn't know which one you want. | 12:21 |
| Stavros | ah, so --overwrite should fix any future conflicts, yes? | 12:22 |
| james_w | yes, I think so, though it's not necessarily a good idea to always use --overwrite | 12:23 |
| james_w | why do you think you will have more conflicts? | 12:23 |
| Stavros | i don't really think i will, but i'm pretty sure i won't have any changes there i want to keep, so it's the safe bet | 12:24 |
| luks | that reminds me I should file a bug report about adding --overwrite-tags | 12:24 |
| Stavros | oh, that would be quite useful | 12:24 |
| Stavros | well, thank you all very much for your help, it works quite well now | 12:30 |
| === mrevell is now known as mrevell-lunch | ||
| uniscript | I'm wanting to copy an svn branch/tree from one repo to another where I don't have server access to the repos. I wonder if bzr-svn can help with this? | 13:31 |
| uniscript | I've branched the source using bzr-svn now how do I push it up to the target? | 13:31 |
| james_w | uniscript: bzr svn-push is probably what you want | 13:35 |
| james_w | uniscript: the branch doesn't exist in the second repo, correct? | 13:35 |
| uniscript | correct | 13:35 |
| uniscript | if I try svn-push it wants to merge | 13:36 |
| james_w | yeah, svn-push is the answer I think. | 13:36 |
| uniscript | I tried push --overwrite but that's not implemented yet :( | 13:36 |
| uniscript | bzr: ERROR: These branches have diverged. Use the merge command to reconcile them. | 13:38 |
| uniscript | the target directory exists in the repo and is empty | 13:39 |
| uniscript | is that a problem? | 13:39 |
| uniscript | testing... | 13:42 |
| uniscript | seems happy. So that was the problem, can't branch into an empty directory, svn-push has to create the branch dir. OK. Thanks | 13:47 |
| === mrevell-lunch is now known as mrevell | ||
| LeoNerd | Is there a way to do a push-or-pull operation..? Given two bzr branches, push updates from whichever is newer, to whichever is older? (obviously it'd break for diverged history)... | 14:36 |
| hmeland_ | LeoNerd: No, I don't think there is such a thing. A branch and a checkout of that branch comes close, though. | 14:52 |
| LeoNerd | I just wanted to put it in cron.hourly in a "foreach BRANCH in `bzr branches`; ..." command | 14:53 |
| ubotu | New bug: #209688 in bzr-gtk "The branch history window should use a status bar" [Undecided,New] https://launchpad.net/bugs/209688 | 15:05 |
| ubotu | New bug: #209689 in bzr "KeyError in transport close _file_streams while pulling into a bound branch" [Undecided,New] https://launchpad.net/bugs/209689 | 15:05 |
| === mw|out is now known as mw | ||
| vila | bzrlib.tests.test_revisionnamespaces.TestRevisionSpec_date.test_yesterday failed | 16:01 |
| vila | yesterday | 16:01 |
| vila | err, no sometimes around 0.01 this morning | 16:02 |
| vila | ha ha, so funny | 16:02 |
| vila | Anyway, I just demonstrated that this test *is* fragile :) | 16:02 |
| jelmer | (-: | 16:02 |
| mw-home | can bzr export make python eggs from my project? | 16:34 |
| bob2 | like bdist_egg? no. | 16:36 |
| bob2 | there's a setuptoolsbzr thing, tho | 16:36 |
| mw-home | bob2: is that a bzr plugin? | 16:36 |
| bob2 | no, a setuptools one | 16:37 |
| piedoggie | are there any guides on how to use bzr to automatically increment the version number in a setup.py file | 17:04 |
| james_w | piedoggie: there's the version-info command that might help you | 17:07 |
| james_w | I think it's something like bzr version-info > _version.py and then import that in setup.py and grab the revno | 17:07 |
| james_w | version-info --python or something actually | 17:07 |
| james_w | is that what you meant? | 17:08 |
| piedoggie | something like that | 17:09 |
| piedoggie | I still need a figure out how this would affect the version number seen when you run setup | 17:11 |
| piedoggie | also need to figure out how to include it, generate a new one on every commit etc. | 17:11 |
| james_w | well setup.py is python, so you can do all this, and then pass it to the function that you call in there. | 17:11 |
| james_w | ah, on commit, that's different | 17:12 |
| james_w | you could use some sort of hook I think | 17:12 |
| piedoggie | my nickname is Mr. forgetful. I can't tell you the number of times I've created new packages and then fold them up with a single commit for just the version number change | 17:12 |
| james_w | oh yeah, I do that all the time as well | 17:12 |
| LarstiQ | version-info --template might be of help | 17:13 |
| james_w | hi LarstiQ | 17:13 |
| LarstiQ | hey james_w, piedoggie | 17:13 |
| piedoggie | afternoon | 17:14 |
| piedoggie | well, I can see the auto version number update will take a bit more thing time to make it right (or least documented) | 17:16 |
| piedoggie | ... a bit more think time... | 17:16 |
| === Pilky__ is now known as Pilky | ||
| hmeland_ | LeoNerd: Maybe you could do "bzr pull && bzr push;"? I.e. try to pull from "other", and unless that fails, try to push revisions from "this" to "other". | 17:21 |
| LeoNerd | hmeland_: Hmmm... That might work... Though if both fail, how to tell between "sides are identical" from "sides have diverged" ? | 17:21 |
| hmeland_ | Quick test shows that "Nothing to do" will succeed for "bzr pull", at least. | 17:23 |
| LeoNerd | Ah OK. :) | 17:24 |
| hmeland_ | You can apparently also use "bzr pull -q", which will give an ERROR if the branches have diverged. | 17:26 |
| LeoNerd | OK. That's probably good enough then | 17:27 |
| === kiko is now known as kiko-fud | ||
| === kiko-fud is now known as kiko | ||
| abentley | jelmer: around? | 19:45 |
| jelmer | abentley: hi | 20:07 |
| === mw is now known as mw|food | ||
| abentley | jelmer: We're trying to track down what happened when you got an OOPS error yesterday | 20:47 |
| abentley | It looks as though you tried to register a branch with the name .bzr, but of course that doesn't make much sense. | 20:47 |
| jelmer | ah | 20:48 |
| jelmer | abentley: please ignore those | 20:49 |
| abentley | Well, this is an internal error. Users really shouldn't ever get those. | 20:49 |
| jelmer | abentley: I mass-registered a bunch of branches | 20:49 |
| abentley | Oh, shell-scripting glitch? | 20:50 |
| jelmer | I've got a particular directory structure on my server that I relied on | 20:50 |
| jelmer | I've got a plugin that allows short URL access to those branches and can auto-register them | 20:51 |
| jelmer | It looks like it tried to register all the files in a working tree somewhere | 20:51 |
| abentley | Ah, okay. | 20:51 |
| jelmer | abentley: It would be nice to get a clearer error, but I doubt it would ever happen to a normal user. | 20:52 |
| abentley | Cool. | 20:52 |
| jelmer | It would of course also be nice if launchpad could do recursive finding of branches under a particular URL... | 20:55 |
| xma | 'lo | 21:02 |
| thumper | james_w: the alias patch has been sitting idle as I haven't written appropriate tests yet | 21:02 |
| xma | what should I do when I merge and something is going bad ? | 21:02 |
| james_w | thumper: ah, ok, thanks | 21:02 |
| xma | I resolved the conflict and cleared it | 21:03 |
| xma | but now I am stuck with "pending merges" | 21:03 |
| thumper | james_w: I really should get around to finishing it | 21:03 |
| james_w | it would be nice to have | 21:03 |
| xma | nobody ? :( | 21:05 |
| mwhudson__ | xma: commit? | 21:05 |
| === mwhudson__ is now known as mwhudson | ||
| xma | hum | 21:05 |
| xma | what is the merge command purpose then ? | 21:05 |
| thumper | xma: to merge in changes | 21:05 |
| thumper | xma: it doesn't commit them | 21:06 |
| xma | really ? | 21:06 |
| james_w | to bring the other branch commits in, you still have to check they are merged well and then commit | 21:06 |
| thumper | yes, it is a feature | 21:06 |
| xma | oh I see :) | 21:06 |
| xma | will it take the commit message from the merge patch ? | 21:07 |
| dato | no | 21:07 |
| xma | ok | 21:07 |
| xma | I will have to generate it from my branch then | 21:07 |
| mdke | lifeless: around? | 21:13 |
| xma | are there any python-mode users around ? | 21:18 |
| xma | james_w: is it normal that my merge+commit added stuff not by me ? | 21:19 |
| xma | james_w: there were many lines touched outside of my scope | 21:19 |
| xma | james_w: I only modified 4 files and it seems latest commit did more than that | 21:19 |
| james_w | xma: they were changed in the branch you merged? | 21:19 |
| xma | james_w: dunno | 21:20 |
| xma | james_w: when I bzr status, only my files were marked as "modified" | 21:20 |
| xma | and now I see many lines touched in many other files in the commit | 21:21 |
| james_w | and then where do you see the other lines changed? | 21:21 |
| james_w | no files were marked as added? | 21:21 |
| xma | james_w: ok I think I know why :) bzr send -o mypatch was not enough | 21:22 |
| xma | james_w: I have to add the revision number to | 21:22 |
| xma | o | 21:22 |
| mdke | I'm interested in getting some information about the rich-root-pack format. Is it documented anywhere? Are there any obvious disadvantages to using it? Is it expected to be the default bzr format, and if so, how far away is that? | 21:23 |
| xma | hum no, it is not | 21:23 |
| james_w | mdke: non-rich root repositories don't allow you store a normal file-id for the root of a repo. | 21:24 |
| james_w | This means that they all have the same root id | 21:24 |
| james_w | this, for instance, isn't satisfactory for bzr-svn | 21:25 |
| mdke | I don't think that is a feature we currently use, although I suppose we might like to | 21:25 |
| xma | james_w: how do I know what a particular rev contains ? | 21:25 |
| xma | james_w: I want to see what is in the rev 3318 for instance | 21:25 |
| james_w | mdke: it will not be the default format, though the default format will have rich roots | 21:25 |
| james_w | mdke: perhaps bzr-1.4 will have a new default format with rich-roots | 21:26 |
| mdke | james_w: rich-root-pack will never be the default format? | 21:26 |
| james_w | mdke: no, but an evolution of it will | 21:26 |
| mdke | james_w: will an upgrade from it be supported? | 21:27 |
| james_w | xma: bzr log -v -r 3318 | 21:27 |
| james_w | xma: bzr diff -c 3318 | 21:27 |
| james_w | mdke: yes | 21:27 |
| xma | james_w: thank you | 21:27 |
| james_w | mdke: however I don't think downgrade from rich-root to non-rich-root is supported, as that would throw information away | 21:28 |
| mdke | sure | 21:28 |
| james_w | mdke: I don't think that would be part of your considerations though | 21:28 |
| james_w | is this for the docs? | 21:28 |
| mdke | ubuntu-docs | 21:28 |
| james_w | yeah, we've heard you're not happy with the current state of things | 21:28 |
| mdke | they currently use dirstate-with-subtree | 21:28 |
| mdke | james_w: that's not true, I'm very happy; I'm just trying to figure out what to upgrade to... | 21:29 |
| === mw|food is now known as mw | ||
| jelmer | mdke: they should be able to use --pack-0.92-subtree | 21:29 |
| jelmer | that'll at least give them packs | 21:29 |
| dato | and I thought it could work to -subtree too, albeit very slowly? | 21:29 |
| mdke | jelmer: is that better than rich-root-pack? | 21:29 |
| mdke | james_w: and which format to use for a potential new branch | 21:30 |
| james_w | mdke: ah, we have heard some complaints, but if you're happy that's great | 21:31 |
| xma | james_w: sorry to bother but how do I safely and cleanly get rid of a branch ? | 21:31 |
| jelmer | mdke: better in what sense? | 21:31 |
| mdke | james_w: well, not from me | 21:31 |
| james_w | mdke: the default will be fine. | 21:31 |
| mdke | james_w: hmm? | 21:31 |
| james_w | mdke: probably 1.4 will upgrade that to rich roots, but if you're not going to use rich-root features then there's not much point of using the format | 21:32 |
| james_w | mdke: you asked what to use for a new branch, I was saying the default will be fine.. | 21:32 |
| james_w | xma: is this branch using a shared repository? | 21:32 |
| mdke | james_w: well, wouldn't a major reason to do so be to enable the branch to be used in a shared repository with the other branches | 21:32 |
| xma | james_w: yes it does | 21:33 |
| james_w | mdke: that's very true | 21:33 |
| mdke | jelmer: in any sense :) I was using the word "better" in the way that someone who doesn't know much about the subject would | 21:33 |
| james_w | xma: well rm -rf the branch (after making sure it is the right one, and there are no uncommitted changes, etc.) | 21:33 |
| james_w | however this leaves the revisions in the shared repository | 21:33 |
| james_w | there is currently no way to garbage collect those with a command | 21:34 |
| james_w | if you really want to do it the best way is to create a new repository and then branch all of the branches that you want to keep in to it. | 21:34 |
| xma | james_w: I want, in fact, to get rid of changes I have made onto a branch and put the branch "clean" with no modficiations pending etc. | 21:34 |
| xma | in short, I want to be sure all my files are at revision # | 21:36 |
| james_w | xma: bzr revert -r revno | 21:37 |
| xma | james_w: ok thank you | 21:38 |
| james_w | if that is not the current tip of the branch then that will still leave you with changes | 21:38 |
| james_w | bzr pull -r revno --overwrite . | 21:38 |
| james_w | will put you on a revision with no changes | 21:38 |
| mw-home | I want to use bzr to branch an svn repository. I tried bzr branch svn+http://asfasd and I got an error: bzr: ERROR: Permission denied: ".": PROPFIND request failed on '/ | 21:38 |
| mw-home | Any ideas? | 21:38 |
| james_w | mw-home: I assume you can "info" it with svn | 21:40 |
| mdke | sorry, hit the wrong button | 21:40 |
| mdke | james_w, jelmer - so I'm interested in upgrading to packs because I've heard it will cause good things, but I want all the branches to be the same format so they can go in a shared repository. So I'd need to upgrade the old branches as well as init the new branch with that format | 21:42 |
| mw-home | james_w: yeah, I can run svn info on the repo, and I don't prompted for a userID and password. | 21:42 |
| mdke | I haven't heard any disadvantages so far! | 21:42 |
| mdke | :) | 21:42 |
| jelmer | mdke: in that case, go for --pack-0.92-subtree if you have old branches that use --dirstate-subtree | 21:42 |
| mw | damn nick highliting :) | 21:43 |
| jelmer | mw: what os are you on? | 21:43 |
| mdke | jelmer: what are the reasons that --pack-0.92-subtree is better (in the general sense) than rich-root-pack? It's harder to spell | 21:43 |
| mw | jelmer: opensuse, why? | 21:44 |
| jelmer | mdke: It's impossible to upgrade from --dirstate-subtree to --rich-root-pack afaik | 21:44 |
| mdke | jelmer: I'm trying it by branching into a rich-root-pack shared repo, I was told that should work. it's going ok - about half way | 21:45 |
| jelmer | mdke: In that case, --rich-root-pack would be a better choice, indeed | 21:47 |
| mdke | jelmer: ok, we'll see if it works! | 21:47 |
| mw-home | james_w: any other ideas why bzr branch svn+http would fail on an svn repo that allows the world to read it? | 21:48 |
| mdke | james_w: is there somewhere I can read about the "not happy" thing - I'd like to correct it if it's on a public list | 21:49 |
| jelmer | mw: what version of bzr-svn? | 21:51 |
| james_w | mdke: no, it was just on IRC, here and Ubuntu channels. The complaint was that checkout was slow, and that the branch may not have been optimal from some things that may have happened in the past | 21:51 |
| james_w | but there was nothing concrete in the last part | 21:52 |
| mw | jelmer: sorry, i think you mean to be asking mw-home | 21:52 |
| mw-home | jelmer: 1.0 | 21:52 |
| jelmer | mw: Whoops, sorry | 21:52 |
| jelmer | mw-home: Uhm, there is no bzr-svn 1.0 :-) | 21:53 |
| mw-home | jelmer: sorry. 0.47 | 21:53 |
| mdke | james_w: ok fine - I think it's more a question of just trying to optimise things, the checkout was always going to be slow because of the size of the working tree and the downloading of the revision history | 21:53 |
| mw-home | 0.4.7 | 21:53 |
| james_w | mdke: yeah, it's not optimal, I'm sure. And I'm sure people get annoyed by the delays as well. | 21:54 |
| mw-home | I installed bzr-svn as an ubuntu package. Maybe I should remove that package and grab the bzr branch of the package instead? | 21:54 |
| jelmer | mw-home: is this a public repository> | 21:54 |
| jelmer | ? | 21:54 |
| mw-home | jelmer: yeah it is a public read-only repository. here it is: http://svn.traceback.org/python | 21:55 |
| jelmer | mw-home: The repository requires authentication, e.g. "svn ls http://svn.traceback.org/python" | 21:57 |
| mw-home | jelmer: I don't get prompted for authentication on the /python subdir. | 21:58 |
| mw-home | unrelated question. is bzr-svn/stable a tagged release of bzr? | 21:59 |
| mw-home | bzr-svn? | 21:59 |
| jelmer | mw-home: bzr-svn requires access to the root of the repository | 22:01 |
| mw-home | jelmer: got it. thanks. | 22:01 |
| jelmer | mw-home: not sure I understand your other question | 22:02 |
| mw-home | my other question is, i just did a bzr branch on bzr-svn/stable. Now I have a $HOME/.bazaar/plugins/stable directory. Do I need to rename stable to bzr_svn? | 22:02 |
| jelmer | you have to rename it to svn | 22:04 |
| mw-home | gotcha. | 22:04 |
| mw-home | Should that be in the README file? I can send in a patch with that text edit if you want. | 22:05 |
| jelmer | I think it will tell you if you give it another name | 22:05 |
| jelmer | although patches (or bundles, rather) that improve the documentation are very welcome | 22:06 |
| lifeless | mdke: hi, will be around in one hour | 22:09 |
| mdke | lifeless: morning :) will try and hang around | 22:14 |
| mdke | jelmer: looks like it is working ok! the shared repo is 1.3GB on the new format as opposed to 1.6GB with the old one, a tidy saving | 22:57 |
| lifeless | mdke: hi | 22:58 |
| mdke | lifeless: hiya. I've been playing with converting the branches to rich-root-pack format, with the space saving as above | 22:58 |
| mdke | I'm still thinking of starting our intrepid branch from scratch though, just to wipe the slate clean | 23:00 |
| mdke | I think we have a lot of heavy stuff hanging around in the history that we don't use | 23:01 |
| mdke | and of course for historic record, we have it in the old branches | 23:03 |
| james_w | mdke: just as a heads up, if you do decide to do this then --file-ids-from will probably be what you want to do for the first add in your new branch | 23:04 |
| lifeless | I'm just looking at your branch now | 23:04 |
| james_w | hi lifeless | 23:05 |
| lifeless | hi james_w | 23:13 |
| lifeless | mdke: so I'm doing some analysis to figure out how big your branches various data items are | 23:13 |
| mdke | lifeless: sounds good | 23:16 |
| abentley | james_w: Your changes to the Revision documentation make it a lot longer and intimidating. | 23:18 |
| abentley | If you're going to go into that kind of detail, could you try writing it in newspaper style, putting the most important things first? | 23:18 |
| james_w | abentley: sure, I'll do that tomorrow | 23:20 |
| abentley | Thanks. | 23:20 |
| lifeless | abentley: IIRC someone wrote a branch stats generator | 23:30 |
| lifeless | abentley: do you remember it ? | 23:30 |
| fullermd | I vaguely remember some stats thing that listed number of commits by commiter or something like that... | 23:31 |
| mdke | lifeless: what's the diagnosis? | 23:33 |
| lifeless | mdke: still getting a clone | 23:33 |
| lifeless | mdke: you really should upgrade to rich-root-pack :P | 23:34 |
| bob2 | "bad", then ;) | 23:34 |
| lifeless | whether or not you start over | 23:34 |
| mdke | lifeless: ok. Would it help for you to have access to my pc? | 23:34 |
| mdke | I have the branches converted to rich-root-pack there | 23:34 |
| lifeless | not really | 23:34 |
| lifeless | its cloning inside the dc | 23:35 |
| mdke | ok | 23:35 |
| mdke | lifeless: out of interest, is it possible for me to overwrite the launchpad branches now I've got converted local branches with rich-root-pack? | 23:37 |
| mdke | or do I need to delete the existing ones and recreate them | 23:37 |
| lifeless | mdke: bzr upgrade sftp://bazaar.launchpad.net/.... | 23:45 |
| lifeless | that will download/upload it all tho, so doing it from a dc machine is preferrable | 23:46 |
| lifeless | we will do a push-button upgrade for lp at some point | 23:46 |
| mdke | lifeless: is bzr upgrade safe to do on that? I tried it on my local branch and it broke. for the conversion I used "bzr init-repo --rich-root-pack ; bzr branch ../old-repo/branch branch" | 23:46 |
| mdke | I dunno if it broke because I have a shared repo or for another reason | 23:46 |
| james_w | mdke: what was the error? | 23:47 |
| mdke | james_w: I didn't make a note of it I'm afraid | 23:47 |
| lifeless | mdke: 'bzr reconcile sftp://....' first then | 23:48 |
| mdke | Ok. I'll try it after hardy is released :) | 23:48 |
| mdke | lifeless: I have to go to bed now. If you could leave a msg here (or more reliably, pop me an email), I'd be very grateful. Thanks for all your help | 23:51 |
| mdke | thanks james_w too | 23:51 |
| igc | morning | 23:57 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!