| * igc out for a few hours - bbl | 00:43 | |
| zekopeko__ | hi | 00:49 |
|---|---|---|
| zekopeko__ | i was in here the other day with a truly messy bzr repo | 00:50 |
| zekopeko__ | so i was wondering how could one clean said repo of cruft? | 00:50 |
| bob2 | where cruft = unwanted branches? | 00:51 |
| zekopeko__ | if by branches you mean revisions then yes | 00:51 |
| bob2 | I don't | 00:51 |
| zekopeko__ | there is like a complete git repo and binary files | 00:51 |
| zekopeko__ | it's scary | 00:52 |
| zekopeko__ | and it's some 300mb with anon bzr branch | 00:52 |
| zekopeko__ | but the program is less when 1mb with icons | 00:52 |
| zekopeko__ | *then | 00:52 |
| zekopeko__ | could i take a good revision that is high and simply drop anything below that? | 00:53 |
| zekopeko__ | btw the repo is here: https://code.launchpad.net/gloobus | 00:55 |
| poolie | zekopeko__: if it's really messy i'd just drop the history and re-import a snapshot of it | 01:06 |
| poolie | then rename the old one to trunk-ol/d | 01:06 |
| poolie | trunk-old* | 01:06 |
| zekopeko__ | i was thinking along those lines | 01:06 |
| zekopeko__ | is there some guide or something that could help me? i never used bzr but hate seeing this cruft | 01:07 |
| poolie | i can look at the branch if you like but basically | 01:09 |
| poolie | well, | 01:09 |
| poolie | actually, i should check first - is this your project? | 01:09 |
| zekopeko__ | no | 01:10 |
| zekopeko__ | but i have somebody that has commit access | 01:10 |
| poolie | ok | 01:15 |
| poolie | have you talked to somebody on the project about cleaning it upL | 01:15 |
| poolie | i don't mind helping you | 01:15 |
| poolie | but it will be smoother if it's coordinated with others | 01:16 |
| poolie | anyhow, what i eventually suggest you do is | 01:16 |
| poolie | get a checkout of the branch | 01:16 |
| DanRabbit | poolie: I'm on the Gloobus Project :) | 01:16 |
| poolie | that was 1 | 01:16 |
| poolie | 2- 'rm -r .bzr' to remove the old history | 01:16 |
| poolie | 3- remove the junk | 01:16 |
| poolie | 4- 'bzr init; bzr add; bzr ci -m snapshot' to start a new history | 01:17 |
| poolie | 5- rename the old trunk on launchpad | 01:17 |
| poolie | 6- push this new branch and make it the trunk | 01:17 |
| zekopeko__ | you got that DanRabbit? :P | 01:17 |
| DanRabbit | yep | 01:17 |
| DanRabbit | .bzr directory here is 88 MB | 01:18 |
| DanRabbit | lol | 01:18 |
| poolie | does that make sense? | 01:18 |
| DanRabbit | that it's 88 MB? not to me | 01:18 |
| DanRabbit | what to do? | 01:18 |
| DanRabbit | yep | 01:18 |
| zekopeko__ | sweet, thanks poolie! | 01:21 |
| DanRabbit | yes, thankyou poolie | 01:22 |
| poolie | happy to help | 01:22 |
| poolie | hello spiv? | 01:22 |
| spiv | poolie: hi | 01:22 |
| poolie | just saying hi really | 02:11 |
| poolie | going to close mail and start piloting in earnest soon | 02:11 |
| spiv | poolie: hooray for piloting :) | 02:21 |
| spiv | poolie: I'm busily replying to the deluge of review comments on the per-file merge patch | 02:21 |
| spiv | poolie: it's great to get so much thoughtful feedback on a patch from so many people, but also a bit overwhelming. | 02:21 |
| spiv | poolie: btw, I've been enjoying new progress reporting | 02:40 |
| spiv | poolie: it was a bit disconcerting at first because my eyes had been trained to expect to see the info about 30 columns further right than it is now | 02:41 |
| spiv | poolie: but now I've got used to that I've found I don't miss the bar at all | 02:41 |
| === timchen119 is now known as nasloc__ | ||
| lifeless | poolie: what time would you like beer? | 03:06 |
| mwhudson | jelmer: man, wtf? | 03:23 |
| mwhudson | (about codeplex) | 03:23 |
| lifeless | mwhudson: ECONTEXT | 03:24 |
| mwhudson | lifeless: https://bugs.launchpad.net/bugs/498925 | 03:25 |
| ubottu | Ubuntu bug 498925 in bzr-svn "assert svn_revprops.has_key(properties.PROP_REVISION_DATE) can fail" [Low,Triaged] | 03:25 |
| mwhudson | Codeplex has a custom subversion implementation (on top of Visual | 03:25 |
| mwhudson | SourceSafe or something?) that is kinda dodgy and inconsistent. | 03:25 |
| mwhudson | my sense of order in the world didn't need to know about that | 03:25 |
| lifeless | ah | 03:27 |
| lifeless | just like google then ? | 03:27 |
| Kilroo | Just for the record, I want to make it clear that I find it highly amusing that git and bzr can both take an existing subversion repository and push it to a new blank svn branch without needing shell access at either end, and svn itself apparently can't. | 03:30 |
| Peng | lifeless: Google's svn implementation is dodgy? | 03:31 |
| lifeless | Peng: "non standard" | 03:31 |
| Peng | OK. :) | 03:31 |
| poolie | lifeless: say six? | 03:41 |
| poolie | spiv, that's good | 03:41 |
| lifeless | poolie: ok | 03:51 |
| mwhudson | lifeless, Peng: and a bit dodgy | 03:53 |
| Peng | :D | 03:56 |
| Peng | Aside from the odd responses to .bzr requests, and downtime, how is it dodgy? | 03:56 |
| mwhudson | Peng: large cscvs imports never succeed | 03:57 |
| mwhudson | bzr-svn seems to tickle the pain points much less | 03:57 |
| Peng | Oh. Maybe they subcontracted it to SourceForge. ;-) | 03:57 |
| mwhudson | heh | 03:58 |
| poolie | spiv, would it be appropriate to raise NoSmartMedium if we can't connect to the smart server over http? | 04:22 |
| poolie | ie we could potentially connect but we can't actually connect at this url | 04:22 |
| spiv | poolie: Off the top of my head I think so, yes. | 04:23 |
| spiv | I | 04:24 |
| poolie | yes, it seems like it | 04:24 |
| clausen | when I do: | 04:33 |
| clausen | bzr info bzr+ssh://ClausenStrub@c-st.net/~/econ_bib.bzr | 04:33 |
| clausen | I getbzr: ERROR: Not a branch: "bzr+ssh://ClausenStrub@c-st.net/~/econ_bib.bzr/". | 04:34 |
| clausen | what does it mean? | 04:34 |
| clausen | $ ssh ClausenStrub@c-st.net ls -a "~/econ_bib.bzr" | 04:35 |
| clausen | . | 04:35 |
| clausen | .. | 04:35 |
| clausen | .bzr | 04:35 |
| spiv | clausen: it means you probably don't have bzr 2.1.0b3 or newer on the server | 04:36 |
| spiv | clausen: which is needed for /~/ to work in bzr+ssh URLs | 04:36 |
| clausen | oh | 04:37 |
| clausen | the client can't ask the server the version? | 04:37 |
| spiv | clausen: try bzr+ssh://ClausenStrub@c-st.net/home/ClausenStrub/econ_bib.bzr/ (or whatever your home dir is) | 04:37 |
| spiv | It can, but that's not really the issue. The meaning of '~' is very much dependent on the server. | 04:37 |
| spiv | It's not something that clients can calculate without help from the server. | 04:37 |
| clausen | anyway, it's a completely unhelpful message | 04:38 |
| clausen | it should say "file not found" or something | 04:38 |
| clausen | but thanks for your help | 04:38 |
| clausen | I really appreciat eit | 04:38 |
| spiv | Yeah, that's true. | 04:38 |
| clausen | we spent hours on it | 04:38 |
| spiv | "Not a branch" really should have more explanation about why in it. | 04:38 |
| clausen | yeah | 04:38 |
| spiv | I'm fairly sure there's a bug about that somewhere. | 04:38 |
| spiv | Sorry to hear it cost you so much time! | 04:39 |
| clausen | is there an easy way to intercept the traffic? | 04:40 |
| clausen | it would have been helpful to see the data on the wire | 04:40 |
| clausen | with git, I can wrap ssh | 04:40 |
| clausen | which I've found very helpful in the past | 04:40 |
| spiv | "bzr -Dhpss" is often helpful | 04:40 |
| spiv | As in, add -Dhpss to what ever bzr command you're running. | 04:40 |
| spiv | It logs a bunch of stuff about the smart server conversation to ~/.bzr.log | 04:40 |
| spiv | I've also used strace occasionally to trap read/write calls, which is how bzr will be communicating with the ssh subprocess | 04:41 |
| spiv | And you can change the SSH implementation bzr tries with the BZR_SSH environment variable (and there's a config setting too). | 04:42 |
| clausen | ah, same as git then :) | 04:42 |
| clausen | (although it's not documented?) | 04:42 |
| spiv | Which SSH wrapper do you use for git? | 04:42 |
| clausen | I wrote a shell script that does "echo $*; ssh $*" | 04:43 |
| clausen | but you could also use vee | 04:43 |
| spiv | It should be documented somewhere, 'bzr help configuration' for instance mentions BZR_SSH | 04:43 |
| clausen | bzr(1) doesn' | 04:43 |
| clausen | bzr help isn't searchable? | 04:44 |
| spiv | Hmm, that's odd, I wonder how the man page is generated. | 04:44 |
| spiv | There's 'bzr help topics', but all of that content is in the HTML docs too. | 04:44 |
| clausen | python in general has poor documentation tools | 04:45 |
| clausen | (although I could just be ignorant) | 04:45 |
| spiv | e.g. http://doc.bazaar.canonical.com/bzr.2.0/en/user-reference/index.html#configuration-settings | 04:45 |
| clausen | R has a similar philosophy, but seems to work better | 04:46 |
| clausen | (eg: help.search()) | 04:46 |
| clausen | how did you navigate to that page? | 04:46 |
| clausen | ah, you clicked on User Reference | 04:47 |
| clausen | I guess I was expecting that to be many pages, and hence not searchable | 04:47 |
| clausen | good to know :) | 04:47 |
| spiv | clausen: there's a pretty functional search box at http://doc.bazaar.canonical.com/bzr.2.0/en/ too | 04:48 |
| clausen | but it searches the whole site! | 04:48 |
| clausen | you get the same result for many versions of the same document | 04:49 |
| clausen | actually, I'm wrong about that | 04:49 |
| clausen | it's doing something else | 04:49 |
| clausen | anyway, searching "ssh" didn't find it | 04:49 |
| clausen | (item number 33, actually) | 04:50 |
| clausen | I guess the thing that's nice about man pages is you can search for "ENVIRONMENT" | 04:50 |
| clausen | and you have a complete list | 04:50 |
| spiv | Yeah, I don't know why the man page has an incomplete list. | 04:51 |
| spiv | 'bzr help environment' ought to be up to date. | 04:51 |
| clausen | ok, I'll submit a bug on that then :) | 04:51 |
| spiv | (And ought to be what the man page uses for that section) | 04:51 |
| spiv | clausen: thanks :) | 04:51 |
| clausen | $ bzr help environment | 04:51 |
| clausen | bzr: ERROR: No help could be found for 'environment'. Please use 'bzr help topics' to obtain a list of topics. | 04:51 |
| clausen | you mentioned "configuration" before? | 04:52 |
| spiv | Oh, 'env-variables' is the topic name. | 04:52 |
| clausen | it includes BZR_SSH | 04:52 |
| spiv | Yeah, that's a help topic too, but 'bzr help env-variables' is specifically just the environment variables. 'configuration' is a broader topic than just the environment variables, unsurprisingly :) | 04:52 |
| clausen | is there a URL where i can browse the bzr source? | 04:53 |
| clausen | (it's ironic that I can't find it!) | 04:53 |
| spiv | There's a link on code.launchpad.net/bzr | 04:54 |
| clausen | thanks | 04:54 |
| clausen | it's hard-coded! | 05:00 |
| clausen | http://bazaar.launchpad.net/~bzr-pqm/bzr/2.1/annotate/head%3A/bzrlib/doc_generate/autodoc_man.py | 05:00 |
| clausen | no wonder it's unsynchronized | 05:00 |
| clausen | the "bzr help env-variables" command is also hard-coded | 05:05 |
| clausen | in _env_variables, which is defined in bzrlib/help_topics/__init__.py | 05:05 |
| clausen | I must confess, I'm kind of freaking out about this | 05:06 |
| clausen | bzr doesn't seem to have the rigour and elegance of a solid system | 05:06 |
| clausen | (but, I suppose it will get better) | 05:06 |
| spiv | Well, env-variables is as close to the canonical version as we have. | 05:09 |
| poolie | that's a bit of a bug in that page | 05:09 |
| poolie | it should just use the help topic | 05:09 |
| spiv | Right. | 05:10 |
| poolie | i'll file it | 05:10 |
| poolie | https://bugs.edge.launchpad.net/bzr/+bug/498952 | 05:13 |
| ubottu | Ubuntu bug 498952 in bzr "autodoc_man.py should use env-variables, not duplicate it" [Medium,Confirmed] | 05:13 |
| clausen | $ bzr info blah | 05:15 |
| clausen | bzr: ERROR: Not a branch: "/home/clausen/free-software/bzr/blah/". | 05:15 |
| clausen | ^ should say "path not found" | 05:15 |
| spiv | Yes. | 05:15 |
| spiv | "Not a branch" is techinically correct, but not as helpful as it could be. | 05:16 |
| clausen | agreed | 05:16 |
| lifeless | note that a missing parent dir doesn't imply not a branch, it could be a missing plugin (e.g. bzr-svn) | 05:19 |
| clausen | lifeless, of course, but the error message should explain | 05:19 |
| clausen | lifeless, i.e. there should be different error messages for different reasons | 05:19 |
| lifeless | clausen: also we search upwards | 05:19 |
| clausen | I suppose the kosher way to do this would be to subclass errors.NotBranchError | 05:20 |
| lifeless | I agree it could be improved, but I don't think its as shallow as perhaps you think it is | 05:20 |
| clausen | and have things such as errors.NotBranchError.NoPlugin | 05:20 |
| clausen | errors.NotBranchError.NoPath | 05:20 |
| clausen | etc. | 05:20 |
| spiv | clausen: hmm, I think actually just providing an extra string when instantiating NotBranchError | 05:20 |
| lifeless | a typical branch lookup will catch 5 or 6 NotBranchError | 05:20 |
| clausen | spiv, could be | 05:20 |
| lifeless | which one is shown to the user will influence the ui | 05:20 |
| spiv | clausen: (or the exception that lead to it, and have some common code to turn that into a string) | 05:20 |
| lifeless | it doesn't currently. | 05:20 |
| clausen | spiv, I suppose the question is: would anyone ever need to catch a special type of exceeption? | 05:20 |
| clausen | spiv, I guess not | 05:21 |
| spiv | clausen: right | 05:21 |
| lifeless | NoPlugin woul be a prove-a-negative case. | 05:21 |
| clausen | lifeless, yeah, I noticed that a lot of these exceptions are getting caught | 05:21 |
| spiv | It's more providing an extra hint to the user, not a definitive diagnosis: e.g. 'Not a branch: "/foo/barr/baz/qux". ("/foo/barr" does not exist)' would most of the time tell you what you wanted to know | 05:22 |
| spiv | (although actually that particular case would be unlikely to have that much information without doing extra probing) | 05:23 |
| clausen | (it would certainly have helped me!) | 05:24 |
| clausen | (eg: I didn't know if I needed to point at .bzr) | 05:25 |
| clausen | anyway, you've been very helpful | 05:30 |
| clausen | thanks a lot! | 05:30 |
| clausen | sleep time! | 05:30 |
| clausen | bye! | 05:30 |
| clausen | oh, nobody filed the bug yet... I guess I should before I go to sleep | 05:31 |
| clausen | ah, it's #52865 | 05:34 |
| clausen | https://bugs.launchpad.net/bzr/+bug/52865 | 05:34 |
| ubottu | Ubuntu bug 52865 in bzr ""Not a branch" errors could be better when branch is missing." [Wishlist,Confirmed] | 05:34 |
| poolie | spiv, is https://bugs.edge.launchpad.net/bzr/+bug/410332 like something you fixed recently? maybe a dupe? | 06:11 |
| ubottu | Ubuntu bug 410332 in bzr "accessing a bzr:// branch with a revisionspec causes bzr to crash" [Medium,Confirmed] | 06:11 |
| spiv | poolie: hmm, maybe | 06:15 |
| spiv | poolie: I'll try to reproduce quickly | 06:15 |
| spiv | poolie: ah, yep, still current, but a bit obscure | 06:23 |
| spiv | poolie: oh, oops, sorry, it is fixed :) | 06:24 |
| poolie | fail! no, win! | 06:27 |
| poolie | :) | 06:27 |
| gour | jelmer: morning, i opened a ticket for my yesterday's 'bzr dpush to github' problem - https://bugs.launchpad.net/bzr-git/+bug/498962 | 07:01 |
| ubottu | Ubuntu bug 498962 in bzr-git "KeyError(sha)" [Undecided,New] | 07:01 |
| Adys | Is it possible to remember two different pushes? | 08:24 |
| Adys | Eg every time I push, it pushes to both my own branch somewhere, and to a lp: branch | 08:24 |
| spiv | Adys: you can probably use the automirror plugin to do something like that. | 08:25 |
| spiv | I don't think there's anything builtin though. | 08:25 |
| Adys | mm kay | 08:26 |
| Adys | I'll be lazy then :) | 08:27 |
| lifeless | Adys: spiv: bookmarks plugin | 10:46 |
| lifeless | might be close-enough | 10:47 |
| Adys | Meh, as i said I'll be lazy, was hoping for a quick&dirty command, its a temporary lp branch | 10:47 |
| === salgado is now known as salgado-afk | ||
| bialix | hello all | 13:34 |
| rubbs | hello bialix. | 13:35 |
| bialix | hi rubbs | 13:35 |
| rubbs | how are you today? | 13:36 |
| bialix | there is cold today | 13:40 |
| bialix | hope you're better | 13:41 |
| rubbs | It's cold here too. getting snowy as well. | 13:49 |
| rubbs | but I"m pretty good other than that | 13:49 |
| bialix | that's fine :-) | 13:54 |
| === salgado-afk is now known as salgado | ||
| nilg | hi, I'd like to revert undo a revision at some point in the past (10 revisions away from the current one), apparently the command would be: | 14:33 |
| nilg | bzr . merge -10 | 14:33 |
| nilg | is that correct? | 14:33 |
| nilg | (I'm scared to make a mistake...) | 14:33 |
| nilg | or is it the number of the revision, like | 14:34 |
| nilg | bzr . merge -3826 | 14:34 |
| nilg | ? | 14:34 |
| rubbs | An possibly easier way to think about it (more steps but easier to understand) is this: | 14:35 |
| rubbs | bzr branch project -r 3826 ./projectUndo | 14:35 |
| rubbs | then | 14:35 |
| rubbs | bzr merge projectUndo | 14:36 |
| rubbs | I think that's correct... you may want to back things up just in case | 14:36 |
| james_w | that will say "nothing to do" | 14:37 |
| james_w | you want "bzr merge . -10..-11" | 14:37 |
| james_w | merge the changes between the revision and the one before it | 14:38 |
| james_w | i.e. undo those changes | 14:38 |
| james_w | "bzr merge . -r -10..-11" of course | 14:38 |
| rubbs | ah, thanks james_w. I haven't had to do it myself. Thanks for the correction | 14:39 |
| nilg | james_w, the right command for me was "bzr merge . -r -11..-12", thanks! | 14:43 |
| Solipsist | i just installed bzr and qt on mac but i cant find out where bazaar explorer and qbzr are installed | 14:45 |
| bialix | Solipsist: run `bzr plugins` | 14:50 |
| === salgado is now known as salgado-lunch | ||
| Solipsist | now that was totally obvious :) | 14:52 |
| Solipsist | bzr: ERROR: [Errno 2] No such file or directory: '/Users/username/.bazaar/explorer' | 14:52 |
| bialix | Solipsist: what is explorer version? | 14:53 |
| bialix | I think this bug was fixed | 14:53 |
| Solipsist | version is 0.9.0 | 15:00 |
| Solipsist | got it running | 15:07 |
| Solipsist | a note from a new user: bzr is supposedly easier to use than git, my experience so far has been the opposite | 15:08 |
| Solipsist | so im cloning a remote repos as id like to work distributed, pushing changes from my local repos back to the remote is "bzr push", right? local commits "bzr commit"? | 15:10 |
| jelmer_ | Solipsist: yep | 15:13 |
| rubbs | Solipsist: as a member of doc team, I'm interested in the problems you had with bzr. Maybe I can get our team to address holes in the documentation | 15:15 |
| Solipsist | rubbs: the first roadblock i encountered was to figure out how to run bzr explorer, as it was mentioned nowhere, even after extensive googling | 15:17 |
| Solipsist | i tried using spotlight in osx to locate it or qbzr, no luck | 15:17 |
| rubbs | Solipsist: I'll be sure to raise that issue up. We have had a few requests on better plugin documentation. | 15:18 |
| Solipsist | a very concise guide for those of use new to bzr would be appreciated, i dont need a GUI but after having used git with gitx, ive come to find them extremely useful when looking through commits | 15:18 |
| Solipsist | its not the plugin itself but "now that's bzr is installed, what do i do? where did all these applications go?" | 15:19 |
| bialix | Solipsist: you've mixed package problems with ease of use the tool itself | 15:19 |
| Solipsist | the mac os x package needs better documentation | 15:19 |
| bialix | where explorer is the question to the maintainers of Mac installer | 15:19 |
| rubbs | Solipsist: I'll have the mac people look into making it easier to get started from install. | 15:20 |
| bialix | windows installer already provides the user with start menu item, desktop icon and quick launch item | 15:20 |
| Solipsist | if this page explained what the package contained and how to launch and use each plugin it would have made things easier: http://wiki.bazaar.canonical.com/MacOSXDownloads | 15:20 |
| Solipsist | rubbs: awesome! | 15:21 |
| rubbs | The leader of the Doc team is also the main dev for Explorer, so I'll see what I can do to help him understand the problem. He's a good guy and easy to work with. | 15:22 |
| rubbs | My suggestion is to actually raise a bug on launchpad and tag it with "doc." you can give a very brief description of the problem you had and we'll work hard to change that experience | 15:23 |
| === zekopeko_ is now known as zekopeko__ | ||
| glen | hmm, why is bzr giving me such weird error: $ bzr mv 01_notes.php 01_notes.sql | 15:53 |
| glen | bzr: ERROR: Could not move 01_notes.php => 01_notes.sql: UPGRADE/patches is not versioned. | 15:53 |
| glen | bzr log 01_notes.php shows it's revision log, meaning it is versioned | 15:53 |
| rubbs | glen: not sure what's going on there, but you can as a work around do a system mv first and then use the same command you were getting the error on. | 15:54 |
| rubbs | so do : $ mv 01_notes.php 01_notes.sql | 15:55 |
| rubbs | then do : $ bzr mv 01_notes.php 01_notes.sql | 15:55 |
| rubbs | that will cause bzr to see that 01.notes.php doesn't exist, and there is a new file called 01_notes.sql. It assumes you moved it and updates the versioning accordingly | 15:56 |
| === menesis1 is now known as menesis | ||
| glen | now even worse: | 15:56 |
| glen | $ bzr mv 01_notes.php 01_notes.sql | 15:56 |
| glen | bzr: ERROR: Could not rename 01_notes.php => 01_notes.sql: Path(s) do not exist: upgrade/patches/01_notes.php UPGRADE/patches/01_notes.sql | 15:56 |
| glen | what the heck it capializes the path component named "upgrade" ? | 15:57 |
| glen | $ bzr st | 15:58 |
| glen | removed: | 15:58 |
| glen | upgrade/patches/01_notes.php | 15:58 |
| glen | unknown: | 15:58 |
| glen | upgrade/patches/01_notes.sql | 15:58 |
| glen | says it | 15:58 |
| glen | after the last action | 15:58 |
| glen | bzr-0:1.18-2.x86_64 is the version | 15:58 |
| rubbs | any possibility of updating to 2.0? | 15:58 |
| glen | i cloned: bzr clone lp:eventum, and the mv i want to do in upgrade/patches | 15:59 |
| glen | ok, trying to upgrade | 16:00 |
| rubbs | Hmm.. not sure what's going on here. I'm just a user, but the devs check this channel frequently, so just sit tight. someone should be able to help you better | 16:00 |
| === salgado-lunch is now known as salgado | ||
| rubbs | ok, cool | 16:00 |
| rubbs | I can help more with the 2.0 series. (only a little more mind you). | 16:00 |
| glen | any clues is 2.0 having some different dependencies of external packages? | 16:01 |
| rubbs | not sure. | 16:02 |
| rubbs | what type of system are you on? | 16:02 |
| glen | linux | 16:02 |
| rubbs | ubuntu? | 16:02 |
| glen | pld linux | 16:03 |
| glen | 32bit/64bit behave the same, if that's any matter | 16:04 |
| glen | i just suspect "upgrade" has some special meaning somewhere | 16:04 |
| glen | i.e the mv command works ok elsewhere | 16:05 |
| rubbs | could be | 16:05 |
| glen | $ bzr mv xmlrpc_client.php xmlrpc_client.sql | 16:05 |
| glen | misc/xmlrpc_client.php => misc/xmlrpc_client.sql | 16:05 |
| rubbs | I'm wondering if someone did something in Windows, and the case insensitivity is causing problems | 16:05 |
| glen | can you test with your bzr? | 16:05 |
| rubbs | sure just a sec. | 16:05 |
| glen | anyway, 2.0.3 behaves the same way :( | 16:06 |
| glen | maybe this is (also) the reason: | 16:07 |
| glen | $ l upgrade UPGRADE -d | 16:07 |
| glen | drwxr-xr-x 24 glen glen 4.0K 2009-12-21 17:49 upgrade/ | 16:07 |
| glen | -rw-r--r-- 1 glen glen 8.1K 2009-12-03 11:49 UPGRADE | 16:07 |
| glen | i.e the repository has lowercase and uppercase objects present | 16:07 |
| rubbs | weird... | 16:08 |
| rubbs | clone is taking a while. so I haven't tried it yet. but it's getting there | 16:08 |
| === weigon__ is now known as weigon | ||
| glen | anyway, getting rid of the uppercased file "UPGRADE" in root "solved" the problem here | 16:10 |
| rubbs | ok cool. I'm still going to test it to see what's going on | 16:11 |
| glen | it's solved for me, likely bugreport should be filed, but i'm lazy this time so won't go trought the hassle of registering accounts for bugreporting etc | 16:13 |
| rubbs | I'll go ahead and file one for you. I can reproduce the result | 16:14 |
| glen | nice | 16:15 |
| glen | if need some reference, then my commit is: http://bazaar.launchpad.net/~eventum-developers/eventum/trunk/revision/4012 | 16:15 |
| rubbs | thanks. I might put that in there. | 16:16 |
| rubbs | glen: finally got around to submitting that bug and found that someone already has put one up: https://bugs.launchpad.net/bzr/+bug/368931 | 16:30 |
| ubottu | Ubuntu bug 368931 in bzr "Rename may fail when file and directory have the same name differing by case" [High,Confirmed] | 16:30 |
| glen | i see | 16:33 |
| onox | can I put multiple bug numbers in --fixes? | 16:40 |
| james_w | you can pass --fixes as many times as you like | 16:41 |
| onox | thx | 16:41 |
| james_w | commit --fixes foo:1234 --fixes foo:2345 --fixes bar:4567 | 16:41 |
| === deryck is now known as deryck[lunch] | ||
| chmac | Can I reassign existing revisions to a new person? I've changed my whoami to match launchpad... | 17:33 |
| chmac | I was using chm@buna as my email, which is not valid, so I can't validate that address on launchpad to link those revisions to me | 17:33 |
| jelmer_ | chmac: Not without redoing the commits | 17:46 |
| chmac | jelmer_: Ok, thanks | 17:47 |
| === beuno is now known as beuno-lunch | ||
| === deryck[lunch] is now known as deryck | ||
| Tak | yeah, I had the same issue as chmac | 19:08 |
| chmac | Tak: Did you find a reasonable solution? It's only 10 or so commits that are not attributed to me on launchpad, so it really isn't a big issue for my case. | 19:09 |
| Tak | no, I never did | 19:09 |
| === beuno-lunch is now known as beuno | ||
| phinze | jam: ping from iowa city | 19:55 |
| jam | hey phinze | 19:55 |
| jam | keeping warm ? | 19:55 |
| phinze | our radiators ensure that we're always either sweating or freezing, yes :) | 19:56 |
| phinze | i was wondering if you had a moment to walk me through a particularly tricky (but relatively small) bzr dance | 19:56 |
| rubbs | Iowa City? I'm originally from Decorah. | 19:57 |
| phinze | rubbs: i'm a transplant, but i bet there are several in my office who would enjoy that... will pass along | 19:58 |
| phinze | jam: msging you | 19:58 |
| chmac | Is there a faster way to download a branch than just straight `bzr branch lp:wordpress/trunk`? It's taking an age to download all the history. | 20:10 |
| chmac | I considered a lightweight checkout, but I'm going to commit back to a different branch, so I don't think that would work. | 20:10 |
| chmac | I guess it's the price I have to pay the first time to get all the history... :-) | 20:11 |
| rubbs | chmac: if you haven't downloaded it before, then not really... You could try bzr+ssh:// but it requires you to have an account and to have set up keys | 20:11 |
| beuno | chmac, if you have your launchpad-login specified you will use the | 20:11 |
| beuno | "smart server" | 20:11 |
| beuno | which should be faster | 20:11 |
| chmac | I've run launchpad-login already, so it might be using the smart server already... | 20:12 |
| jam | chmac: you may also be running into auto-conversion issues. | 20:12 |
| chmac | I'm online in Mexico City, it's not the fastest connection ever... :-) | 20:12 |
| jam | It looks like wordpress is in --pack-0.92 | 20:12 |
| jam | if you have 2a locally, it will convert on the fly | 20:12 |
| jam | which could be slow | 20:12 |
| chmac | jam: I think my bottleneck is the download speed, I'm seeing 20-40kbs... | 20:13 |
| jam | it is a ~50-60MB download | 20:13 |
| jam | Judging by http://bazaar.launchpad.net/~vcs-imports/wordpress/trunk/.bzr/repository/packs/ | 20:13 |
| jam | I would expect it to be smaller in --2a, if/when it gets converted | 20:13 |
| beuno | jam, I though we where going to convert all imports to 2a? | 20:14 |
| beuno | mwhudson, did that ever happen? & | 20:14 |
| beuno | ^ | 20:14 |
| mwhudson | beuno: no, not yet | 20:14 |
| beuno | mwhudson, is it still on the roadmap? | 20:15 |
| mwhudson | beuno: yes, but in a pretty sparsely populated area of the map i guess | 20:16 |
| beuno | heh, ok | 20:16 |
| mwhudson | beuno: i just added it to https://dev.launchpad.net/CodeTeam#Code%20imports fwiw | 20:16 |
| beuno | mwhudson, thanks | 20:17 |
| amro | I'm having trouble breaking a lock, I tried the provided command and a few variations with no luck (http://amro.pastey.net/130496) | 20:17 |
| beuno | amro, try: bzr break-lock bzr+ssh://sigrie/home/sigrie/projects/xflight/ | 20:18 |
| amro | beuno: that worked, thanks. I thought I tried that | 20:20 |
| amro | what's up with the line provided by bzr? usually it's correct | 20:21 |
| === chmac is now known as chmac_away | ||
| beuno | amro, there are some cases where it doesn't work well, I fail to remember in which ones :) | 20:21 |
| beuno | what version of zbr are you using? | 20:21 |
| beuno | and both server and client | 20:21 |
| amro | 2.0.0, repo is 2.0a I think | 20:22 |
| amro | something like that | 20:22 |
| beuno | on both sides? | 20:22 |
| === salgado is now known as salgado-afk | ||
| Adys | Repo is 2.0a yeha | 20:25 |
| jam | chmac_away, beuno, mwhudson: wordpress does shrink to 20MB after 2a packing... | 20:25 |
| Adys | that said, how do i upgrade from branch format 6 to branch format 7? | 20:26 |
| jam | Adys: 'bzr upgrade' | 20:32 |
| jam | or 'bzr upgrade branch' | 20:32 |
| jam | as fmt 7 is the latest format | 20:32 |
| Adys | cheers | 20:39 |
| halstead|wccls | I have a repository which after 400 revisions had a huge amount of unneeded binary data committed into by accident. Another 20 or so commits have happened over that last few months before anyone noticed. What's the best way to excise the binary files without losing our rich revision history? | 20:40 |
| beuno | halstead|wccls, you would have to rewrite history | 20:41 |
| beuno | there's a plugin calles bzr-rewrite (IIRC) | 20:42 |
| beuno | *called | 20:42 |
| beuno | not sure how to use it | 20:42 |
| beuno | and, you need to know that you will break compatibility with all existing branches | 20:42 |
| halstead|wccls | I'll search on those terms. Thats for the lead. I thought maybe I could start a new branch and pull the first 400 revisions and then layer ont he later changes somehow without pull everything in. | 20:42 |
| halstead|wccls | Thank you for the lead. | 20:43 |
| beuno | halstead|wccls, you can also branch from the last good revision | 20:44 |
| halstead|wccls | Braking compatibility with existing branches is not a problem for us. All our contributers can make a fresh branch. | 20:44 |
| beuno | and merge in the good revisions | 20:45 |
| beuno | will make history look wonky | 20:45 |
| halstead|wccls | beuno, I will try that. | 20:46 |
| phinze | beuno: (lurking for learning) would there be a way to "replay" the revisions rather than merging them all with one revision? | 20:46 |
| phinze | a la 'bzr pull' would tack them onto the end? | 20:46 |
| beuno | phinze, well, I'm sure there is a way, but I don't know how I would do it | 20:46 |
| beuno | jam, is the expert on rewriting history :) | 20:47 |
| phinze | indeed, he saved the day for me once again today | 20:47 |
| phinze | i believe bzr-rebase would be the tool that could do it, but how to use it, i know not | 20:49 |
| phinze | so bzr branch -r$REVISION_BEFORE_BINARIES trunk trunk_sans_bin | 20:50 |
| phinze | cd trunk_sans_bin; bzr merge ../trunk -r$REVISION_AFTER_BINARIES.. | 20:50 |
| phinze | bzr rebase --pending-merges | 20:50 |
| phinze | i _think_ that might do it | 20:50 |
| phinze | --pending-merges "Rebase pending merges onto local branch." | 20:51 |
| beuno | that sounds about right, yes | 20:51 |
| halstead|wccls | Thank you. | 20:51 |
| phinze | halstead|wccls: np -- a bit of the blind leading the blind :) but i hope it works for you | 20:52 |
| beuno | halstead|wccls, http://doc.bazaar.canonical.com/plugins/en/rebase-plugin.html | 20:53 |
| poolie | hello jam | 21:10 |
| === poolie changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://bazaar-vcs.org | http://irclogs.ubuntu.com/ | Patch pilot: mbp | bzr 2.1.0b4 and 2.0.3 released | ||
| jam | hey poolie | 21:12 |
| jam | beuno, phinze: replay is probably what you want, but jelmer is the expert | 21:12 |
| poolie | shall we talk? | 21:13 |
| halstead|wccls | phinze, What effect is the double dot at the end having? bzr merge ../trunk -r$REVISION_AFTER_BINARIES.. | 21:13 |
| jam | sure | 21:13 |
| poolie | skype/pots? | 21:14 |
| jam | pots is always easier for me, but i've got skype, too | 21:14 |
| phinze | halstead|wccls: it means "$REVISION_AFTER_BINARIES and every revision thereafter" | 21:14 |
| poolie | k | 21:15 |
| poolie | jam: strace yes|sleep 60 | 21:20 |
| === chmac_away is now known as chmac | ||
| chmac | jam: Not sure what conversion to 2a means. From what you said I'm thinking that it'll happen automatically at some point... :-) | 21:49 |
| chmac | Plus, the new branch I request 2.9 will have a lot less history than trunk, so that'll be quicker | 21:49 |
| spiv | chmac: 2a is the current repository format, it became the default in bzr 2.0. "bzr upgrade" will upgrade an existing repo to it. | 21:52 |
| chmac | spiv: Ok, so I could upgrade repos I've created myself. lp:wordpress/2.9 is an auto-imported repo so I'm guessing I can't modify it any more, or can i? | 21:53 |
| chmac | https://code.launchpad.net/~chmac/wordpress/2.9 | 21:53 |
| chmac | If I rename the repo, or assign it to a team instead of me, will the import process continue to work? | 21:56 |
| chmac | I noticed some other auto imported branches are ~vsimports/blah | 21:56 |
| spiv | chmac: I think you can file a request (at https://answers.launchpad.net/launchpad) to get the import upgraded\ | 21:57 |
| chmac | I think it makes sense for the branch to be owned by a generic user rather than me, it's the wordpress/branches/2.9 release rather than my own version of it, my own version will be based off it | 21:57 |
| spiv | chmac: ^ mwhudson | 21:57 |
| chmac | I love the responsiveness of people on this channel, launchpad has a very human feel to it... :-) | 21:57 |
| === khmarbaise_ is now known as khmarbaise | ||
| chmac | Oh, I'm on the wrong channel, DOH! | 22:06 |
| chmac | Sweet, just updated bzr thanks to https://launchpad.net/~bzr/+archive/ppa | 22:15 |
| mwhudson | spiv, chmac: hmm? | 22:18 |
| spiv | mwhudson: see #launchpad, looks like intellectronica has taken care of things | 22:37 |
| mwhudson | spiv: ah, ok | 22:38 |
| chmac | Oh, yeah, sorry, I didn't follow up on that, intellectronica did indeed take care of it for me :-) | 22:38 |
| chmac | I ran `bzr branch lp:~vcs-imports/wordpress/2.9 wp29` then `bzr rm wp29/wp-includes/js/tinymce/` then `bzr commit -m "blah"`, it gave me the next available revision number | 22:39 |
| chmac | That might get confusing when a new commit comes into 2.9 as the numbers might be the same | 22:39 |
| chmac | Is that the way things are supposed to work, my version number will only apply to my branch, or is there an alternative I'm missing? | 22:40 |
| chmac | Can I specify my own version numbers as rchmac-1 or something? | 22:40 |
| jam | chmac: revision *numbers* are a branch local number | 22:44 |
| chmac | jam: Ok, so I can ignore it, the numbers might be the same but that doesn't matter, is that correct? | 22:44 |
| jam | chmac: right | 22:47 |
| chmac | jam: Ok, thanks :-) | 22:47 |
| jam | numbers are a useful shortcut in the context of a branch | 22:47 |
| jam | so you can say "did you get rev 10 of my branch", and someone can see that they are only at 8 | 22:48 |
| jam | etc | 22:48 |
| jam | internally we have unique revision-ids | 22:48 |
| jam | but they don't have obvious ordinal semantics | 22:48 |
| jam | (bzr log --show-ids if you want the details) | 22:48 |
| chmac | Ok, they're specific to the branch. I've seen the long gnarly revision ids, I'm guessing they're the globally unique id | 22:48 |
| jam | yep | 22:48 |
| chmac | Can I safely `cp -r branch1 branch2` and then work on them separately? | 22:50 |
| chmac | I tried `bzr branch branch1 branch2`, then branch2 shows its parent as branch1, which is accurate. I really want to branch from lp but safe myself downloading it all again... :-) | 22:51 |
| jam | chmac: create a shared repository | 22:51 |
| jam | bzr init-repo . | 22:51 |
| jam | bzr reconfigured --use-shared branch1 | 22:51 |
| jam | then all branches created underneath the repo | 22:51 |
| jam | will share the storage | 22:51 |
| jam | and you won't redownload everything | 22:51 |
| jam | sorry' | 22:52 |
| jam | 'bzr reconfigure ...' | 22:52 |
| chmac | jam: Ok, I'll read up on those, sounds like what I want, thanks | 22:52 |
| blueyed | I had local commits, which apparently got reverted when I wanted to revert the conflicts from "bzr up" (which I've thought would have been a "bzr merge"). Any chance to get those internal merge back from the internals of bzr? | 23:14 |
| bob2 | bzr heads | 23:15 |
| chmac | bzr push --stacked-on=lp:~vcs-imports/wordpress/2.9 bzr+ssh://chmac@bazaar.launchpad.net/~wpflavours/wordpress/wpflavour-no-visual-editor | 23:15 |
| chmac | bzr: ERROR: Not a branch: "/home/chm/W/Code/wpflavours/wpflavour-no-visual-editor/lp:~vcs-imports/wordpress/2.9/". | 23:15 |
| bob2 | bound branches can be awkward | 23:15 |
| bob2 | especially if you forget to commit before bzr up | 23:16 |
| chmac | Am I overcomplicating maybe? Can I just `bzr push lp:~wpflavours/wordpress/wpflavour-no-visual-editor` and bzr will know that the code came from lp:~vcs-imports/wordpress/2.9 originally? | 23:16 |
| spiv | chmac: I think you need to give the full bzr+ssh URL instead of lp: to --stacked-on | 23:17 |
| chmac | spiv: Oh crap, I expanded the lp: in the wrong part of the command, DOH! | 23:17 |
| blueyed | bob2: thanks so far.. have found a revision-id.. how can I apply this back now? | 23:18 |
| chmac | spiv: Thanks, I'll try that, that's what I meant to do | 23:18 |
| bob2 | blueyed: first, back up everything so you don't lose what you have | 23:18 |
| chmac | Took me long enough to figure out what lp: expanded to, then I put it in the wrong place! | 23:18 |
| bob2 | blueyed: then 'bzr branch -r revid:afdsdfasdfggsfg@rftwertert-243241234 . ../recovered' | 23:20 |
| chmac | spiv: Looks like it's working, thanks :-) | 23:22 |
| lifeless | bob2: 'bzr merge . -r revid:revid:afdsdfasdfggsfg@rftwertert-243241234' is easier | 23:23 |
| bob2 | hm | 23:24 |
| blueyed | this is f*cking b0rked.. I'm getting blogs.moved.moved etc.. also when trying to merge the dead parent. | 23:26 |
| blueyed | will have to resolve this by hand I fear. | 23:26 |
| blueyed | this probably conflicts so much again, since I'm merging into a branch, where I had local changes made (and cherrypicked from), but the parent's ancestor had been changed. | 23:27 |
| blueyed | Can I forbid bzr-svn to kick in when I only want to add a symlink (which points at at directory with .svn in it)? | 23:29 |
| lifeless | blueyed: to add a symlink just run 'bzr add', not 'bzr add symlink' | 23:30 |
| blueyed | lifeless: but I do not want to add all that .moved stuff.. | 23:30 |
| lifeless | blueyed: so clean it up first | 23:31 |
| blueyed | ok, but the workaround does work.. will do add "add $DIR" then revert. | 23:31 |
| spiv | blueyed: you can pass --no-recurse to add | 23:40 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!