| === tchan1 is now known as tchan | ||
| igc | poolie: can I land https://code.edge.launchpad.net/~ian-clatworthy/bzr/user-ref-topics/+merge/16750 now? | 00:03 |
|---|---|---|
| jelmer | lifeless: Hi | 00:39 |
| kirkland | i need to generate a diff with bzr diff, but I need the resulting patch to have a -p1 | 00:54 |
| kirkland | is there some option i can pass to bzr diff to add an arbitrary additional leading dir? | 00:54 |
| fullermd | -p | 00:55 |
| kirkland | fullermd: cheers | 00:55 |
| poolie | hi igc | 00:56 |
| poolie | igc, yes | 00:56 |
| igc | poolie: thanks | 00:57 |
| bendj | Hi. Reading in UserGuide, "Trailing slashes on patterns are ignored. If the pattern contains a slash or is a regular expression, it is compared to the whole path from the branch root. Otherwise, it is compared to only the last component of the path." is unclear to me. If I want to ignore a directory (e.g. "sites/") and all it's contents that's in my current directory, which of the following do i add to .bzrignore? "sites", "sites/", "./sites", etc etc ? | 00:57 |
| spiv | bendj: do you want to ignore any file/directory called 'sites' anywhere in your tree, or just at the root? | 00:59 |
| spiv | if you just want to ignore it (and thus everything under it) at the root, you want "./sites" I think. | 00:59 |
| lifeless | jelmer: hi | 01:03 |
| jelmer | lifeless: Any chance you could follow up to my reply in https://code.edge.launchpad.net/~jelmer/bzr/repo-size/+merge/16582 ? | 01:03 |
| jelmer | lifeless: Basically, I'd like to have an overridable function for the number of revisions since that's all I want to override for foreign branch implementations | 01:04 |
| spiv | bendj: to be precise, "./sites" will ignore (root)/sites as well as everything under it. If just want to ignore everything under it (but not ignore (root)/sites), then I think you'd want "./sites/*". | 01:17 |
| === raimue is now known as Raim | ||
| meoblast001 | hi, i accidently did something in the middle of writting a commit message that locked my branch, how do i force unlock? | 01:49 |
| cody-somerville | meoblast001, bzr break-lock | 01:51 |
| spiv | meoblast001: perhaps you have "bzr diff | less" or similar still open in another terminal? | 01:52 |
| meoblast001 | bzr: ERROR: The lock for '/home/braden/Documents/Development/citrine' is in use and cannot be broken. | 01:52 |
| meoblast001 | spiv: i accidently hit control+z | 01:56 |
| meoblast001 | fixed it | 01:57 |
| meoblast001 | what's this | 01:57 |
| meoblast001 | unknown: bzr_log.kvvUj5 bzr_log.kvvUj5.save | 01:57 |
| Peng | meoblast001: You ran "bzr commit" without supplying a message, and it bzr opened an editor, with that filename. | 01:58 |
| Peng | meoblast001: The .save file is presumably something from your editor/ | 01:58 |
| bendj | spiv Thanks. That clears it up! | 02:29 |
| spiv | bendj: great, glad I could help :) | 02:29 |
| poolie | hi spiv | 02:47 |
| poolie | spiv, patch pilot mail? | 02:47 |
| spiv | poolie: ah right, yes. | 02:48 |
| === froosch_ is now known as froosch | ||
| poolie | this is your cue to nag me about the hottest100 mail :) | 02:55 |
| spiv | poolie: consider yourself nagged ;) | 03:04 |
| poolie | :) | 03:04 |
| chalkbag | Hey folks, is there a way to change author info on revisions committed locally? | 03:08 |
| chalkbag | I put in a wrong email addy :( | 03:08 |
| bob2 | you could use bzr-rebase, I think | 03:18 |
| chalkbag | bob2, hmm, I don't think it's in Fedora repos :o | 03:24 |
| lifeless | its now called rewrite | 03:27 |
| bob2 | ah | 03:28 |
| chalkbag | Sigh - still not there :( I'll install it from source, I guess. Thanks for the pointer! | 03:41 |
| === lamalex_2 is now known as lamalex | ||
| _Andrew | Is there a way to check --append-revisions-only has been set on a branch and also, is there a way to set it after a branch has been initialized? | 04:39 |
| bob2 | you can edit .bzr/branch.conf or so | 04:40 |
| _Andrew | ah | 04:49 |
| _Andrew | when you init a bzr with --append-revisions-only it just adds a setting in the branch.conf | 04:49 |
| _Andrew | Thanks, I understand now | 04:49 |
| brmassa | guys, how can i disable the bzr-notify from my ubuntu? | 05:02 |
| AfC | brmassa: uninstall the bzr-dbus package? | 05:10 |
| brmassa | AfC: i dont know exactly. it seems bzr-notify only notifies me that i commited some code, which is pointless since i know what i just did. and its using my pc's resources. so i want to remove it at least from boot. | 05:11 |
| _Andrew | Can I merge changes from branch6 format into 2a format? | 06:36 |
| Peng | _Andrew: Those two branch formats can intermingle fine. It's the repo format where you may run into trouble. | 06:37 |
| _Andrew | repo format? | 06:37 |
| spiv | _Andrew: look at the output of 'bzr info -v', for instance. | 06:38 |
| _Andrew | ah ok | 06:39 |
| spiv | The formats of the different components (working tree, branch, repository) are largely orthogonal. | 06:39 |
| === AfC1 is now known as AfC | ||
| _Andrew | http://paste.ubuntu.com/351642/ | 06:40 |
| _Andrew | Well, that's what I have before and after upgrade | 06:40 |
| _Andrew | It looks like the repository format is different too, so does that mean it's a problem? | 06:41 |
| Peng | I don't see a problem? | 06:42 |
| spiv | _Andrew: that all looks fine to me | 06:42 |
| _Andrew | great | 06:42 |
| _Andrew | thanks | 06:42 |
| spiv | _Andrew: those are all the most current formats | 06:42 |
| spiv | _Andrew: and the same as you'd get with e.g. 'bzr init' from a new version of bzr. | 06:42 |
| _Andrew | because we have some code I need to merge into the newly upgraded repo from the old format | 06:43 |
| _Andrew | from another repo in the old format ** | 06:43 |
| spiv | Unless you've been using experimental formats, you can always take history from old to new. | 06:44 |
| _Andrew | ah ok | 06:44 |
| spiv | (In this case you won't be able to take commits made in the new repo back into your old repo though.) | 06:45 |
| _Andrew | That's fine. I just want to be able to move over all the commits from everyones branches before moving everyone over to the new repo | 06:47 |
| poolie | vila, hi? | 07:07 |
| vila | hi all ! | 07:28 |
| vila | hey poolie ! | 07:28 |
| poolie | hi vila | 07:33 |
| poolie | how about a quick call? | 07:33 |
| vila | poolie: just a sec | 07:34 |
| bialix | heya bzr | 09:40 |
| Peng | Good morning. :) | 09:40 |
| bialix | hi Peng | 09:41 |
| vila | hi bialix | 10:08 |
| bialix | hi vila, happy new year! | 10:15 |
| vila | bialix: you too ! | 10:17 |
| jszakmeister | hi balix! | 10:49 |
| jszakmeister | Would have time for some QBzr/QShelve related questions? | 10:49 |
| jszakmeister | If not, I can just send them to the list. | 10:50 |
| mathrick | hiya | 10:58 |
| mathrick | is there a way to find out what revisions are in the store that aren't in the tree? | 10:58 |
| mathrick | ie. if I have uncommitted some time ago and would like now to get back that revision, how do I get to that revspec bzr prints when you do uncommit? | 10:59 |
| bialix | hi jszakmeister! | 11:00 |
| bialix | happy new year | 11:00 |
| * bialix bbiab | 11:00 | |
| bob2 | mathrick: bzr heads | 11:01 |
| Peng | mathrick: The original uncommit command, and the "bzr pull" suggestion it spits out, might still be in your .bzr.log as well. | 11:02 |
| mathrick | bob2: thanks, lemme try that | 11:04 |
| mathrick | uh-huh, it seems to go through everything in this shared repo | 11:04 |
| === Kamping_Kaiser is now known as Bambi_BOFH | ||
| bob2 | could be | 11:07 |
| mathrick | and now it hits some SVN branch which tries to "analyse layouts" of 1365 revisions at the rate of 1 revision per 5 minutes | 11:08 |
| jszakmeister | mathrick: maybe use --dead-only? | 11:15 |
| jszakmeister | I've not used bzr heads much... so I can't so for sure it will help you. | 11:15 |
| mathrick | jszakmeister: that's what I tried, but it still insists on touching that bzr-svn one | 11:15 |
| mathrick | I'm trying to dissuade it now | 11:15 |
| jszakmeister | Bummer. :-( | 11:15 |
| * bialix back | 11:18 | |
| bialix | jszakmeister: ping? | 11:19 |
| jszakmeister | Yep, I'm here. | 11:19 |
| jszakmeister | Quick question | 11:19 |
| jszakmeister | I'm looking at qshelve stuff again (sorry for the long break)... | 11:19 |
| jszakmeister | I was originally thinking of using the TreeWidget... | 11:20 |
| Peng | At worst, you can temporarily disable bzr-svn. | 11:20 |
| Peng | mathrick: ^ | 11:20 |
| jszakmeister | but the more I look at it, the more I'm thinking that maybe I shouldn't | 11:20 |
| jszakmeister | I need to open the diff editor by default, need tristate checks (which I think I can do, but I'm not sure yet), and there were a couple other small things. | 11:21 |
| jszakmeister | Should I just do something else, or should I refactor TreeWidget to allow me to override the behaviors I need? | 11:22 |
| bialix | oh | 11:22 |
| bialix | maybe ScrollableArea? | 11:23 |
| bialix | do you want to use side-by-side diff? | 11:23 |
| jszakmeister | I thought we were going to call out to a tool as a first cut? | 11:23 |
| bialix | mmm, I don't understand | 11:24 |
| mathrick | peng: yeah, that's what I arrived at now, trying to make it not raise from the dead :) | 11:24 |
| jszakmeister | I meant I need to override the default double click behavior in TreeWidget in the changes view. | 11:24 |
| jszakmeister | I think we want it to open the external tool when you double click on a modified file so that you can shelve some of the changes, right? | 11:25 |
| bialix | jszakmeister: I think I forgot some details | 11:25 |
| jszakmeister | It's been a while. :-) | 11:25 |
| bialix | yep | 11:25 |
| bialix | and I was too busy with work | 11:26 |
| jszakmeister | Same here | 11:26 |
| jszakmeister | Lemme dig up a link real quick... | 11:26 |
| bialix | TreeWidget is the most universal widget it seems | 11:27 |
| bialix | do we really want it? | 11:28 |
| jszakmeister | That's basically my question. It's nice because it already collects the changed files... | 11:28 |
| bialix | just to create list of files? that's will be nice,we have similar in treewidget.py | 11:28 |
| jszakmeister | I'm sorry... that's the tree widget I'm talking about. :-) | 11:28 |
| bialix | do you mean built-in qt QTreeWidget or Gary's treewidget.py? | 11:29 |
| jszakmeister | Gary's | 11:29 |
| bialix | oh | 11:29 |
| bialix | yep | 11:29 |
| bialix | I'm guess reusing that widget is the right way | 11:29 |
| bialix | it's already has enough power and allows customization | 11:29 |
| bialix | you made a sketch at first about 2 panel side-by-side interface | 11:30 |
| jszakmeister | Is it a problem if I subclass it? | 11:30 |
| bialix | but then we talked about using external tool to get more fine grained control over changes to shelve | 11:31 |
| bialix | why that's a problem? | 11:31 |
| jszakmeister | Just looking to do what is acceptable. :-) | 11:31 |
| jszakmeister | I've been on some projects that have a methodology that discourages subclassing. | 11:32 |
| jszakmeister | I think I can subclass and override the few bits that I need to make it launch an external tool. | 11:33 |
| bialix | do you need subclassing to override some methods? | 11:33 |
| jszakmeister | Yes. | 11:33 |
| bialix | if these bits are not generic enough then I don't see a problem with subclass | 11:33 |
| bialix | what is the reasons to avoid subclassing? | 11:34 |
| bialix | speed of python? | 11:34 |
| jszakmeister | Seriously, I have no idea... they're were just adamant about a few things, and that was one of them. | 11:35 |
| bialix | it was a python project? or? | 11:35 |
| jszakmeister | Either you built everything into the class, or you duplicated code. :-( | 11:35 |
| jszakmeister | Java, IIRC | 11:35 |
| bialix | have no real experience with Java, sorry | 11:36 |
| jszakmeister | It was just stupid policy. :-) | 11:36 |
| bialix | in Python very deep subclassing may affects performance, IIRC | 11:36 |
| bialix | but it's not the case yet | 11:36 |
| jszakmeister | I could see that with having to scan the base classes for a method. | 11:37 |
| bialix | yep | 11:37 |
| jszakmeister | Thanks for the help. I'm gonna see if I can get something more working this week. | 11:37 |
| jszakmeister | Off to work! Happy New Year! | 11:38 |
| bialix | will be nice! let the power be with you :-) | 11:38 |
| bialix | :-) | 11:38 |
| bialix | rats, wrong quote | 11:42 |
| * bialix sighs | 11:42 | |
| === mrevell is now known as mrevell-lunch | ||
| === mrevell-lunch is now known as mrevell | ||
| mgolisch | whats the easiest way to setup some location to store bzr branches? | 14:28 |
| mgolisch | sftp? | 14:28 |
| Peng | mgolisch: I'd probably do it over SSH, but I'm already SSHed into my bzr server anyway. | 14:29 |
| Peng | mgolisch: bzr init-repo should be able to take a remote location/ | 14:29 |
| mgolisch | is there a way to list all branches and some info about them from a repository? | 14:31 |
| mgolisch | didnt find anything that sounds like that from bzr help commands | 14:31 |
| jam | morning all | 14:35 |
| Peng | mgolisch: The bzrtools plugin provides a "bzr branches" command. Just gives a list, no other info, though. | 14:36 |
| Peng | mgolisch: Also, can be horribly slow in the face of bzr-svn... | 14:36 |
| mgolisch | basicaly what i want is setup a shared repo that could be accessed by all workstations here, and that would allow ppl to create new branches in it and operate in them from their workstations | 14:37 |
| mgolisch | without having to do any fancy cmdline foo on the server to create new branches etc | 14:37 |
| Peng | Oh. | 14:40 |
| Peng | I thought you meant the initial setup. | 14:40 |
| Peng | Sure, creating new branches just takes a "bzr push". | 14:40 |
| Peng | Dunno how you should set it up, though... You could give everybody one SSH login, or give them each their own shared repo (or use stacked branches) and have them use different users. | 14:41 |
| Peng | s/give everybody one SSH login/use the same SSH login for everybody/ | 14:41 |
| bialix | hi jam, and happy new year! | 14:49 |
| mgolisch | Peng: thx i think ill go with only one ssh login/user | 14:54 |
| mgolisch | :) | 14:54 |
| === beuno is now known as beuno-lunch | ||
| jam | happy new year to you bialix | 15:45 |
| bialix | :-) | 15:46 |
| === deryck is now known as deryck[lunch] | ||
| === beuno-lunch is now known as beuno | ||
| jam | james_w: are you around for a chat? | 16:36 |
| james_w | hi jam | 16:36 |
| jam | james_w: just trying to follow up on udd/hottest100 and feel a bit lost | 16:37 |
| jam | I figured I might as well poke at the bugs you've filed so far | 16:37 |
| jam | and at least see where they are at | 16:37 |
| jam | for example, bug #496764, are you working on that, and/or is it something that helps the import stuff? | 16:37 |
| ubottu | Launchpad bug 496764 in bzr "want a hook for diverged graphs" [Medium,Confirmed] https://launchpad.net/bugs/496764 | 16:37 |
| jam | Or is it just helpful for the builder side? | 16:37 |
| james_w | it's not an import thing | 16:38 |
| james_w | it's for the user experience | 16:38 |
| jam | james_w: what about bug #484228 | 16:42 |
| ubottu | Launchpad bug 484228 in bzr "Issue when merging cwidget: bzrlib.errors.NoSuchFile: No such file: ('changelog-blahblah') in iter_file_bytes" [High,Confirmed] https://launchpad.net/bugs/484228 | 16:42 |
| jam | you marked it invalid in bzr-builddeb | 16:42 |
| jam | but it is still open in bzr | 16:42 |
| jam | the discussion sounds like it is just a dupe of another bzr bug which has been fixed | 16:42 |
| james_w | that may well be the case | 16:42 |
| jam | and bug #492647, that seems more like import-side issues, but is it hitting any of the 'hottest100' ? | 16:42 |
| ubottu | Launchpad bug 492647 in bzr "\r not allowed in commit message" [Low,Confirmed] https://launchpad.net/bugs/492647 | 16:43 |
| james_w | I left the bzr task open so someone more familiar with the other bug could make the judgement | 16:43 |
| jam | k, I'll close #484228 | 16:43 |
| jam | we can re-open later if necessary | 16:43 |
| james_w | I don't know if that's a hottest100 | 16:45 |
| james_w | as you say, kerberos isn't, I just opened it at the request of mathiaz | 16:45 |
| james_w | should we have a hottest100 tag as well as udd? | 16:45 |
| jam | james_w: that is what it sounded like in Martin's last email | 16:46 |
| jam | the idea being our first focus target for helping udd is getting the top 100 imports working | 16:46 |
| jam | james_w: and the last udd bug #488724 | 16:47 |
| ubottu | Launchpad bug 488724 in bzr "commands updating working tree should provide the same modification time for all modified files" [High,Confirmed] https://launchpad.net/bugs/488724 | 16:47 |
| jam | this sounds like we need to settle on a timestamp, and then have transform set the mtime on all files before it moves them into the working dir. | 16:47 |
| jam | But I don't really understand why this is a udd bug | 16:47 |
| james_w | yep, was just thinking from an organisational perspective. You will want to see the list of outstanding hottest100, while we still want lists of udd bugs. | 16:48 |
| jam | james_w: right | 16:48 |
| james_w | I'm not exactly sure about that one | 16:48 |
| james_w | I think it was filed after discussions at UDS, but I can't remember if I was involved, or which problem we were talking about | 16:49 |
| vila | jam: because it was mentioned as a top wish list item in UDS | 16:49 |
| jam | hey vila, happy new year, btw | 16:50 |
| jam | I was missing you around here :) | 16:50 |
| vila | jam: hey, yeah, you too :) | 16:50 |
| jam | I should be getting my espresso machine today | 16:53 |
| jam | \o/ | 16:53 |
| vila | hehe, can't start the day without one myself :) | 16:53 |
| jam | well, I have a crummy steam-powered one that does both drip and "espresso", but I'm upgrading to a genuine one | 16:54 |
| jam | vila: http://www.amazon.com/dp/B000TBEU3S/ref=asc_df_B000TBEU3S994674?smid=ATVPDKIKX0DER&tag=googlecom09c9-20&linkCode=asn&creative=380341&creativeASIN=B000TBEU3S | 16:54 |
| vila | ouch,mine is far less expensive (I seem to remember we pay ~100 euros, maybe 150) but still makes the best expresso I know about :) I could buy a new SSD for that price :-D | 16:56 |
| vila | hmm, wth happens on my SSD *right* now ? :-/ | 16:57 |
| === deryck[lunch] is now known as deryck | ||
| jam | vila: well, I got it from a different place that had a cheaper base price *and* 20% off. I was just looking for a picture :) | 16:58 |
| jam | and at the EU => USD conversion, isn't that about the same price now? :) | 16:59 |
| vila | lol, I wish :) | 16:59 |
| jam | http://www.google.com/search?q=euro+to+usd | 16:59 |
| jam | says 1.44:1 | 16:59 |
| jam | So I guess closer to 210EU | 17:00 |
| vila | wow, I'm still not used to that, I'm used to Apple prices being 1 EU == 1$ :-D | 17:01 |
| vila | http://www.amazon.fr/Krups-F88042-Cafeti%C3%A8re-espresso-noir/dp/B0002JZ2D4/ref=sr_1_23?ie=UTF8&s=kitchen&qid=1262711038&sr=8-23 | 17:04 |
| vila | I wasn;t that far, 160EU | 17:04 |
| vila | And you should taste it soon hopefully :-/ | 17:05 |
| vila | :-) I meant | 17:05 |
| * vila will have a hard time explaining the typo :-) | 17:05 | |
| jam | vila: The review's I've read said "stay away from crema-enhancing" models. The give you crema at the expense of flavor | 17:07 |
| Pilky | vila: in all fairness to Apple, the EU prices are with VAT and the US are without sales tax | 17:07 |
| jam | Anyway, I had originally planned to shoot for closer to $200, but I saw this one on a good deal and couldn't resist | 17:07 |
| vila | jam: Enjoy ! Is all I have to say :) | 17:07 |
| jam | Pilky: except when ordering online, you don't always pay sales tax | 17:07 |
| Pilky | that said, an iMac is $1200 in the US, but ~$1325 in the UK/EU without tax | 17:07 |
| jam | though I think you are supposed to report it to your state gov, and pay it there... | 17:08 |
| vila | jam: You have to use the local Apple Store and the taxes apply there | 17:08 |
| jam | Pilky: that is just the cost of the euro/pound key :) | 17:08 |
| vila | Pilky: : Enjoy ! Is all I have to say :) I love my Apple hardware even when I run Ubuntu on it :) | 17:09 |
| Pilky | oh well, even if I bought it at the US price, I'm still too poor to afford a Core i7 27" iMac at the moment :p | 17:09 |
| Pilky | jam: also the cost of having a vertical enter key rather than the annoying horizontal ones on US keyboards ;) | 17:10 |
| vila | Pilky: don'tmention that ! I bought a US keyboard without realizing that :-( | 17:11 |
| Pilky | I once tried typing on my friend's US MacBook and kept hitting the | 17:11 |
| Pilky | \ key | 17:11 |
| Pilky | because I always hit the top of the return key | 17:12 |
| vila | really ? | 17:12 |
| vila | :-/ | 17:12 |
| Pilky | Of course I'm currently using an MS keyboard so half the keys type different things | 17:12 |
| Pilky | UK Windows keyboards are weird in some places | 17:13 |
| jam | Pilky: seems better to hit the lower part, since it is closer to home row... | 17:13 |
| Pilky | like " is shift-2 and @ is shift-' | 17:13 |
| jam | Pilky: really old commodore keyboards had that | 17:14 |
| Pilky | which to me makes no logical sense, but oh well | 17:14 |
| Pilky | jam: well that's how modern UK windows keyboards work. Macs flip it around. Never thought to check any Linux distros | 17:14 |
| Pilky | oh well, even if the keys are labelled wrong, I still love my keyboard :p | 17:15 |
| Pilky | jfroy: ping | 17:16 |
| jfroy | Pilky: morning | 17:16 |
| Pilky | jfroy: got some more mockups for you: http://dropbox.mcubedsw.com/bazaarxdesigndoc/bazaarxdesigndoc.html | 17:16 |
| Pilky | still tweaking but most of the screens are there | 17:17 |
| jam | Pilky: of course I have a US layout, but run Dvorak | 17:18 |
| jam | so none of my keys type what they should :) | 17:18 |
| jam | well, except the number keys | 17:18 |
| Pilky | lol | 17:18 |
| Pilky | well I couldn't even re-arrange my keys if I wanted as I've got an ergonomic keyboard so they can pretty much only fit in once place | 17:19 |
| jam | vila: does OSX have futimens ? | 17:19 |
| * fullermd shudders. | 17:20 | |
| vila | futimes ! damn I was wondering what you were talking about :) | 17:20 |
| fullermd | Just LOOKING at an "ergonomic" keyboard makes my hands hurt. | 17:20 |
| vila | jam: yes | 17:20 |
| jam | vila: http://www.kernel.org/doc/man-pages/online/pages/man2/utimensat.2.html fu-time-ns | 17:20 |
| jam | so we'd need to track down the function for Win32, but we could probably expose futimens in the _read_dir extension | 17:21 |
| tedg1 | Is there a way to regenerate indexes? I thought there was, but I can't find it now. | 17:21 |
| vila | jam: then no | 17:21 |
| jam | vila: well fu-time-s would be sufficient for our need | 17:21 |
| jam | if it also exists elsewhere | 17:21 |
| jam | 1s resolution is enough for the bug | 17:22 |
| vila | I was about to ask, yes | 17:22 |
| Pilky | fullermd: http://www.infoprix.ca/images/pieces/921_1-Microsoft-Natural-Ergonomic-4000-Fr..jpg :p | 17:22 |
| * fullermd twitches. | 17:22 | |
| Pilky | heh | 17:22 |
| * fullermd cuddles up with his 18 year old Type M. | 17:23 | |
| Pilky | jam: this could help with OS X http://developer.apple.com/mac/library/documentation/Darwin/Reference/ManPages/index.html#group_Section_1_man_FA | 17:25 |
| A4Tech | hi all | 17:36 |
| A4Tech | i have a some trouble... http://paste.ubuntu.com/351882/ | 17:36 |
| stakh | hello, I'm trying to use bzr, but have difficulties doing push or pull between my branches. I always get a bzr: ERROR: invalid header line: '' | 17:50 |
| stakh | error message | 17:50 |
| stakh | Any ideas of what could be going wrong? | 17:50 |
| james_w | stakh: could you try again passing -Derror on the command line? | 17:58 |
| stakh | $ bzr push -Derror ~/WebDav/myDisk/webpage/PIM/ | 18:00 |
| stakh | bzr: ERROR: bzrlib.errors.BzrError: invalid header line: '' | 18:00 |
| stakh | Traceback (most recent call last): | 18:00 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code | 18:00 |
| stakh | return the_callable(*args, **kwargs) | 18:00 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 1037, in run_bzr | 18:00 |
| stakh | ret = run(*run_argv) | 18:00 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases | 18:00 |
| stakh | return self.run(**all_cmd_args) | 18:00 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/builtins.py", line 1156, in run | 18:00 |
| stakh | use_existing_dir=use_existing_dir) | 18:00 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/push.py", line 128, in _show_push_branch | 18:00 |
| stakh | remember, create_prefix) | 18:00 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/bzrdir.py", line 1293, in push_branch | 18:00 |
| stakh | tree_to.update() | 18:00 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/workingtree.py", line 2216, in update | 18:00 |
| stakh | return self._update_tree(old_tip, change_reporter) | 18:00 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/mutabletree.py", line 53, in tree_write_locked | 18:00 |
| stakh | return unbound(self, *args, **kwargs) | 18:00 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/workingtree.py", line 2239, in _update_tree | 18:00 |
| A4Tech | ... | 18:00 |
| stakh | last_rev = self.get_parent_ids()[0] | 18:00 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/decorators.py", line 138, in read_locked | 18:01 |
| stakh | result = unbound(self, *args, **kwargs) | 18:01 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/workingtree_4.py", line 413, in get_parent_ids | 18:01 |
| stakh | return self.current_dirstate().get_parent_ids() | 18:01 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/dirstate.py", line 1903, in get_parent_ids | 18:01 |
| stakh | self._read_header_if_needed() | 18:01 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/dirstate.py", line 2228, in _read_header_if_needed | 18:01 |
| stakh | self._read_header() | 18:01 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/dirstate.py", line 2210, in _read_header | 18:01 |
| stakh | self._read_prelude() | 18:01 |
| nailuj24 | ahem ^^ | 18:01 |
| stakh | File "/usr/lib/python2.6/site-packages/bzrlib/dirstate.py", line 2242, in _read_prelude | 18:01 |
| stakh | 'invalid header line: %r' % (header,)) | 18:01 |
| * beuno facepalm | 18:01 | |
| stakh | BzrError: invalid header line: '' | 18:01 |
| stakh | sorry for the spamming... | 18:01 |
| A4Tech | stakh: USE PASTBIN ==> http://paste.ubuntu.com | 18:02 |
| * nailuj24 points stakh to www.paste.ubuntu.com | 18:02 | |
| stakh | that's better : http://paste.ubuntu.com/351895/ | 18:03 |
| nailuj24 | thanks | 18:04 |
| Flimm | How can I get bzr gdiff to ignore whitespace? | 18:04 |
| stakh | actually, I realized that it's also impossible to add files in one of the branches. Something must be corrupted with it | 18:33 |
| stakh | I solved the issue by deleting the defective branch and recreating it. Seems to be working now, just hope it does not happen too often | 18:44 |
| happyaron | hi, how can I make my local bzr repository show files in a specific revision? | 18:49 |
| beuno | happyaron, you can branch at a specific revision | 18:50 |
| beuno | or, if it's just one file: bzr cat FILENAME -r REVNO | 18:50 |
| beuno | or if you want to revert the whole tree, bzr revert -r REVNO | 18:50 |
| happyaron | beuno: oh, just revert, but how can I turn back then? | 18:51 |
| beuno | happyaron, don't commit, and then just "bzr revert" | 18:51 |
| happyaron | ok, thanks | 18:51 |
| beuno | but I'd branch off if you're going to experiment ;) | 18:51 |
| A4Tech | https://bugs.launchpad.net/bzr/+bug/503465 need help | 18:52 |
| ubottu | Ubuntu bug 503465 in bzr "bzr crash when tying login in launchpad" [Undecided,New] | 18:52 |
| happyaron | beuno: oh, I will make another copy first | 18:53 |
| beuno | happyaron, why not just branch off then? | 18:53 |
| beuno | it's effectively the same thing | 18:54 |
| happyaron | beuno: I am new with bzr, and always mess up | 18:54 |
| happyaron | and I don't want to check out everything for a second time ... | 18:55 |
| happyaron | beuno: I think it works, thanks | 19:02 |
| lifeless | jam: are we fully redundant now ? | 20:21 |
| lifeless | jam: AFAIK we still had ambiguous records in the pack | 20:21 |
| jam | lifeless: text files don't store the parent graph | 20:22 |
| jam | and neither do revisions, but we could infer that | 20:22 |
| jam | from the Revision data | 20:22 |
| jam | infering the text graph requires going through the inventories and regenerating it, etc. | 20:23 |
| jam | so we are *sort of * redundant :) | 20:23 |
| jam | not trivially so | 20:23 |
| lifeless | jam: right, and not in the presence of bugs generating the original data. | 20:27 |
| jam | lifeless: well, you could set the data to empty, and then run reconcile, right ? :) | 20:28 |
| jam | oh... | 20:28 |
| jam | and we don't store the file-id for the text content | 20:28 |
| jam | only in the index | 20:28 |
| jam | so we would have to guess | 20:28 |
| lifeless | well, use the sha1 from the inventory | 20:29 |
| lifeless | and hope its not the DoD's birthday. | 20:29 |
| lifeless | jam: can you finish helping ted? I'm really not well. | 20:31 |
| jam | lifeless: sure | 20:31 |
| jam | feel better | 20:31 |
| A4Tech | Why my commits by bzr on launchpad.net displayed as Registry Administrators <https://launchpad.net/~registry> | 20:34 |
| A4Tech | mb offtopic? but on #launchpad unaware | 20:35 |
| marsilainen | can I commit binary files (eg. a png image file) to bazaar in just the same way as text files? | 21:10 |
| nailuj24 | marsilainen: yes | 21:12 |
| marsilainen | ok, thanks | 21:12 |
| nailuj24 | np | 21:13 |
| thumper | hi people | 21:19 |
| thumper | what answer do we give to people who have branched a packs repo into a local 2a | 21:20 |
| thumper | and try to push / commit back? | 21:20 |
| thumper | (happening on #launchpad right now) | 21:20 |
| jam | A4Tech: can you point to an actual commit that shows up that way? | 21:31 |
| jam | thumper: push upstream to upgrade | 21:32 |
| jam | and/or | 21:32 |
| jam | start over | 21:32 |
| jam | I'm not sure if 'rebase' provides enough support to allow you to regenerate the commits easily. | 21:32 |
| A4Tech | jam trouble fixed | 21:32 |
| === nailuj24 is now known as nailuj24ischeati | ||
| === nailuj24ischeati is now known as nailuj24 | ||
| spiv | Good morning. | 22:52 |
| Peng | Good morning. :D | 22:53 |
| A4Tech | morning?! :) | 22:55 |
| A4Tech | Although of course I know we should not forget that - when I got up, then the morning :) | 22:56 |
| saedelaere | hi | 22:58 |
| saedelaere | i'am using the bzr explorer and this tool is great. but there is one question. | 22:59 |
| Peng | Just one? I guess that's pretty good. :D | 22:59 |
| saedelaere | when i want to push a new commit a new dialog opens and at the top i can choose a location. there the last location that i was using is stored. but there is this down arrow, can it be used to choose different locations? where would i have to define them? | 23:01 |
| wahben | Hi all! | 23:18 |
| wahben | I am new to version control systems. What is the best approach to prevent some files from being uploaded; example: I created a project on launchpad where I uploaded a web-application code. Some parts of the code contain data that is specific to my development environment (database passwords, smtp auth passwords, etc). How do people usually deal with this kind of situation? Does bzr provide some kind of functionality to handle this kind of situation? | 23:21 |
| nailuj24 | wahben: bzr ignore --help | 23:22 |
| nailuj24 | :) | 23:22 |
| bob2 | put them in config files | 23:22 |
| bob2 | and don't add the config files | 23:22 |
| saedelaere | right, never add that kind of data to the source code | 23:23 |
| wahben | and if I create a branch using "bzr branch ./trunk ./dev" then I push the trunk using "bzr push (..launchpad)", will the "dev" branch also appear on launchpad or only the trunk? | 23:25 |
| bob2 | only the one you push | 23:25 |
| wahben | I see.. earlier I branched out my "dev" to create a "trunk", then made changes to the settings file to remove sensitive data, did a "commit" and then pushed to launchpad. Revision 1 & 2 appeared on launchpad, revision 1 containing all my sensitive data... that kinda sucked... | 23:28 |
| bob2 | yes | 23:28 |
| bob2 | if you're only at rev 2, you might want to start over | 23:28 |
| saedelaere | i'am normaly using sourceforge for my projects. now i added one also to launchpad. i'Am completely new to this interface and just don't find where i can upload files. What do i have to do? | 23:28 |
| wahben | i did start over | 23:28 |
| bob2 | that's not starting over | 23:28 |
| bob2 | or did you do something else? | 23:28 |
| wahben | I mean I removed the .bzr folder, removed the branch from launchpad and re-pushed the proper way | 23:29 |
| bob2 | saedelaere: try #launchpad if no one pipes up here | 23:29 |
| wahben | but now I am being more careful with what I do... anyways, i'll look into ignore. | 23:30 |
| bob2 | ah, so you're sorted? launchpad doesn't host your passwords anymore? | 23:30 |
| wahben | bob2, of course, I sorted that in the 30 seconds after I realized what I had done | 23:31 |
| bob2 | ah | 23:31 |
| bob2 | sorry, I thought you were asking how to fix that | 23:31 |
| * saedelaere zzz | 23:31 | |
| wahben | thanks for your help, i'll look into --ignore | 23:32 |
| jml | is there any known way to work with a moin wiki using bzr? | 23:42 |
| ronny | jml: you mean a vzr backend for moinmoin? | 23:44 |
| ronny | *bzr | 23:44 |
| jml | ronny, not necessarily | 23:44 |
| ronny | jml: then what do you mean? | 23:44 |
| ronny | ima a part-time moinmoin contributor (i.e. conference based patching) | 23:45 |
| jml | ronny, I mean, being able to have local copies of moin wiki pages, to be able to edit them, commit, revert, merge updates from the wiki and then push them to the wiki when I am ready to publish | 23:45 |
| ronny | ah, so you mean a foreign repo format | 23:45 |
| jml | ronny, yeah, I think that's closer to what I mean. | 23:46 |
| jml | ronny, I mean, if moin had a bzr backend (which it probably ought to), that would give me what I want for free -- provided I could convince wiki maintainers to switch | 23:46 |
| ronny | for now a bzr backend is unlikely | 23:46 |
| ronny | at least a sane one | 23:47 |
| jml | ronny, fair enough. | 23:47 |
| jml | ronny, what about a remote repo format? | 23:47 |
| ronny | versioned file metadata is required | 23:47 |
| ronny | possible | 23:47 |
| ronny | but you better target the 2.0 | 23:47 |
| jml | 'the 2.0'? | 23:47 |
| ronny | moin 2.0 has a completely different storage system | 23:48 |
| jml | ronny, ahh, I see. | 23:48 |
| ronny | lifeless: btw, is there any reasonable way to add versioned per-file metadata? afair a2 doesnt have it | 23:48 |
| jml | ronny, I would have guessed that the remote repo format would operate via the webservice anyway | 23:48 |
| ronny | jml: the moinmoin < 2.0 has a kind of messy storage engine | 23:49 |
| ronny | 2.0 fixes that | 23:49 |
| ronny | in a really good way | 23:49 |
| ronny | hmm | 23:51 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!
