| Amything | cant push to the network drive at all | 00:10 |
|---|---|---|
| maxb | I am considering trying to convince my workplace to use bzr. One question I don't have an answer for: How do people manage nice browsing and display of branches of a project, if they don't have it in a site which presents a shiny UI like Launchpad? | 00:18 |
| bob2 | loggerhead! | 00:20 |
| james_w | poolie: do you have the admin password for the udd list? | 00:25 |
| arjenAU | hmm | 01:27 |
| arjenAU | ahoy gurus | 01:27 |
| arjenAU | I aborted a bush to lp. now tells me locked, suggested using break-lock. but the url given does not work | 01:27 |
| arjenAU | bzr: ERROR: Unsupported protocol for url "lp-46129552:///~maria-captains/maria/5.1.39-oqgraph/.bzr/branch/lock" | 01:27 |
| arjenAU | hmm if I use the regular bzr+ssh url I can break it. just the display is wrong. i'll file a bug on that | 01:30 |
| arjenAU | https://bugs.launchpad.net/bzr/+bug/250451 existing/confirmed problem it seems. few months old though | 01:35 |
| ubottu | Launchpad bug 250451 in bzr "bzr suggests wrong URL for break-lock for smart-server branches" [High,Confirmed] | 01:35 |
| spiv | maxb: use loggerhead | 01:50 |
| spiv | maxb: or am I misunderstanding you? | 01:50 |
| * maxb has been playing with it.... it's a start | 01:51 | |
| spiv | arjenAU: yes, bzr break-lock lp:~maria-captains/maria/5.1.39-oqgraph, it is an old bug but kinda hard to fix for various reasons | 01:52 |
| maxb | It doesn't seem entirely amenable to putting multiple projects under a directory tree without mentioning each project explicitly in the config | 01:52 |
| lifeless | maxb: bzr serve --http /path/to/root | 01:53 |
| lifeless | maxb: will Just Work | 01:53 |
| arjenAU | spiv: well I just specified the actual push url, you don't have it available lowlevel? | 01:55 |
| === ubott2 is now known as ubottu | ||
| RenatoSilva | how to find the revision that has introduced a particular change? | 02:09 |
| RenatoSilva | e.g with bzr log -p | grep 'particular-change' I can get the -change and +change, but I don't know what revision | 02:11 |
| RenatoSilva | it's abit boring to bzr log -p > file, and browse it | 02:11 |
| bob2 | bzr blame | 02:11 |
| bob2 | depending on what you mean by 'particular change' | 02:12 |
| bob2 | (bzr blame will show the last time each line was altered) | 02:12 |
| arjenAU | RenatoSilva: you can also do bzr log -p pathname for a particualr file. | 02:13 |
| RenatoSilva | bob2: no I don't want annotation, I would have info just about the last rev that introduced the line | 02:15 |
| RenatoSilva | arjenAU: ok, less boring | 02:15 |
| arjenAU | RenatoSilva: yep. easy to /search, then you see which rev, and then you can just do -p on that -r to see everything to do with it and such. | 02:16 |
| arjenAU | well that's how I'd do it. there are so many commands but people tend to pick a few that work for them. | 02:16 |
| arjenAU | I love log -p. | 02:16 |
| RenatoSilva | would be nice if qbzr allowed to search the changes, like a bzr qlog -p or so | 02:16 |
| arjenAU | RenatoSilva: maybe bzr glog or one of the other gtk commands. | 02:17 |
| RenatoSilva | arjenAU: ok using it with eclipse ide, I do a search like (<change>|revno), so I get the changes highlighted, and jsut need to click the annotations to know the underlying revno | 02:26 |
| RenatoSilva | revision 19! | 02:27 |
| arjenAU | well there ya go. enjoy | 02:27 |
| RenatoSilva | it would be really nice to have something like bzr search | 02:30 |
| RenatoSilva | $bzr search 'xyz' | 02:31 |
| RenatoSilva | rev 23: +xyz | 02:31 |
| RenatoSilva | rev 42: -xyz | 02:31 |
| RAOF | RenatoSilva: Are you aware that there _is_ a bzr-search plugin? | 02:42 |
| RAOF | I don't think the output is as you described, though. Let's see... | 02:42 |
| RenatoSilva | RAOF: I'm afraid it's not | 02:46 |
| RAOF | Also, my version of bzr-search seems to fail on everything I try. Whoops. | 02:46 |
| === elmo_ is now known as elmo | ||
| versatiletech | can I push to a local directory instead of connecting to a remote server? | 03:30 |
| bob2 | sire | 03:43 |
| versatiletech | ? | 03:44 |
| RenatoSilva | sure | 03:45 |
| RenatoSilva | bzr push <dir> | 03:45 |
| versatiletech | nice | 03:47 |
| versatiletech | I'm starting to really like bazaar for its simplicity | 03:48 |
| versatiletech | so far it's much friendlier than svn | 03:50 |
| RenatoSilva | sometimes I guess the bzr command for doing what I want | 03:53 |
| RenatoSilva | because the command is sort of obvious or natural | 03:53 |
| versatiletech | yeah | 03:54 |
| RenatoSilva | I guessed bzr ignored for example, just typed and worked :) | 03:54 |
| versatiletech | lol | 03:54 |
| versatiletech | what's the opposite of bzr init? | 04:11 |
| mwhudson | versatiletech: rm -rf .bzr | 04:13 |
| versatiletech | k | 04:13 |
| versatiletech | mwhudson: is there only one .bzr directory in the root folder of the bzr project? | 04:16 |
| mwhudson | versatiletech: yes | 04:16 |
| mwhudson | (it's not like .svn) | 04:16 |
| versatiletech | beautiful! | 04:16 |
| versatiletech | I love that! | 04:16 |
| versatiletech | that's one thing I hated about svn | 04:17 |
| wgrant | IME, the worst bit about having .svn/s everywhere is that it makes it impossible to grep for things. | 04:22 |
| mwhudson | well | 04:23 |
| mwhudson | harder | 04:23 |
| lifeless | ack | 04:27 |
| lifeless | or bzr search | 04:27 |
| RenatoSilva | does bzr search plugin return revisions? | 04:46 |
| ChrisMorgan | I have Python 2.5 installed and am on Win32; which version of Bazaar should I be installing, the standalone one or the Python 2.5 one? | 04:53 |
| offby1 | Newbie time: I did "bzr branch svn+ssh://...", and in that new directory, made an edit and committed it. I then figured I needed to do "bzr push" to get the change into my subversion repository, but that command said "bzr: ERROR: No push location known or specified.". What am I misunderstanding? | 04:57 |
| offby1 | hm, may have figured it out: I just tried "bzr push svn+ssh://...", and that seemed to work | 04:59 |
| offby1 | in other words, it didn't assume that I wanted to push to the same place from which I branched | 04:59 |
| bob2 | yes | 05:00 |
| offby1 | gotcha | 05:00 |
| offby1 | gotta say, bzr is a _lot_ slicker than I remembered. | 05:00 |
| offby1 | tolerably fast, too | 05:00 |
| offby1 | thanks. | 05:01 |
| thumper | :( | 07:59 |
| thumper | crash | 07:59 |
| * thumper checks the ppa | 07:59 | |
| === timchen1` is now known as nasloc__ | ||
| maxb | Does anyone know for a brief summary of pipes vs looms, to help me figure out which one I might want to use? | 09:06 |
| maxb | Hmm. I just got a "no such revision" error running bzr rebase - is there any way to track down in what context the not-found revision-id was referred to? | 09:08 |
| lifeless | maxb: pipes do not version the set of pipes; loom versions the set of threads. pipes has a more mature UI I suspect | 09:16 |
| thekorn | hi there, | 09:55 |
| thekorn | in the old online docs of bzr there was a page which describes a setup for a coding sprint | 09:56 |
| thekorn | does anyone of you know where it moved? | 09:57 |
| === raimue is now known as Raim | ||
| lifeless | gnight | 11:36 |
| maxb | What is the status of bzr-rebase? I was trying to get it to work, and found it seems fairly broken if your history isn't perfectly linear | 12:00 |
| jelmer | maxb: broken in what regard? | 12:06 |
| maxb | I think I hit bug 446075 followed by bug 266897 | 12:06 |
| ubottu | Launchpad bug 446075 in bzr-rewrite "NoSuchRevision in _iter_inventory_xmls running bzr rebase" [Undecided,New] https://launchpad.net/bugs/446075 | 12:06 |
| ubottu | Launchpad bug 266897 in bzr-rewrite "bzr-rebase loses merges" [High,Triaged] https://launchpad.net/bugs/266897 | 12:06 |
| maxb | Unfortunately, the combined effect is sufficiently a showstopper that I can't use rebase at all | 12:07 |
| maxb | Perhaps rebase should issue a health warning if it's being run on a history it doesn't know how to handle? | 12:07 |
| jelmer | I'd rather just fix the bug | 12:09 |
| spirov92 | hi guys, how do I make bzr remember sftp passwords? I tried ~/.bazaar/authentication.conf but it didn't work | 12:35 |
| bob2 | don't do that | 12:37 |
| bob2 | setup ssh keys | 12:37 |
| spirov92 | bob2: how is that done? | 12:37 |
| bob2 | are you on windows? | 12:38 |
| spirov92 | nope, linux | 12:38 |
| spirov92 | ~/.bazaar/authentication.conf <<<does that look like windows? :) | 12:38 |
| bob2 | ssh-keygen ; ssh-copy-id remotehost ; get a beer | 12:38 |
| bob2 | oh right | 12:38 |
| bob2 | guess not | 12:38 |
| bob2 | also https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair | 12:39 |
| smartgpx | bialix: good morning. do you have a moment re. qbzr please? | 12:48 |
| bialix | good afternoon, ask | 12:48 |
| smartgpx | OK. trivial spelling error in the qci gui in lib\commit.py. I've corrected it on a local branch and generated a proposed patch. How do I submit the patch - email to a dev, or push back to LP? | 12:50 |
| bialix | any way is good | 12:51 |
| smartgpx | so can I email it to you so you can mentor my approach please? | 12:51 |
| bialix | most of the time people push to LP and then do merge proposal | 12:51 |
| bialix | if you e-mail, please e-mail to the qbzr list | 12:52 |
| smartgpx | this is only a single-character change, but it's a good exercise with the tools for a newbie | 12:52 |
| smartgpx | qbzr doesn't have a ML | 12:53 |
| bialix | really? | 12:55 |
| bialix | smartgpx: http://groups.google.com/group/qbzr | 12:55 |
| bialix | sign in and you can send mails as in usual ML | 12:55 |
| smartgpx | no - not really - yes, as you say, just realised it's on Google. Not mentioned on qbzr page at LP. | 12:56 |
| bialix | yep | 12:57 |
| bialix | there is no way to specify external ML on LP | 12:57 |
| spirov92 | bob2: i don't understand something...this describes how to set up my key with launchpad, but I'm actually using sftp and bzr upload to upload a site to the server. How do I set that up? | 12:58 |
| smartgpx | I can't see how to attach a file with the Google interface - do I include the patch as plain text in the message body? | 12:59 |
| bob2 | spirov92: generate key | 12:59 |
| spirov92 | bob2: i did | 12:59 |
| bob2 | spirov92: ssh-copy-id user@remotehost | 12:59 |
| bob2 | spirov92: grab beer | 12:59 |
| bialix | smartgpx: just send mail to qbzr@googlegroups.com | 13:00 |
| spirov92 | bob2: did that, still asking for user@remotehost's password | 13:00 |
| bob2 | spirov92: ssh to remote host, 'ls -ld ~/.ssh ~/.ssh/authorized_keys' | 13:00 |
| bialix | smartgpx: you need to join the group first, select "not sending mails" if you don't want to get mails from ML | 13:01 |
| bialix | smartgpx: but you can send your mails anyway | 13:01 |
| spirov92 | bob2: -rw------- 1 webmaster webmaster 58 Nov 10 14:54 /home/webmaster/.ssh/authorized_keys | 13:02 |
| spirov92 | bob2: also, drwx------ 2 webmaster webmaster 4096 Nov 10 14:42 /home/webmaster/.ssh | 13:02 |
| bob2 | spirov92: perhaps your admin disabled it | 13:03 |
| spirov92 | bob2: in /home/webmaster/.ssh/authorized_keys it says "The agent has no identities." | 13:04 |
| bob2 | oh | 13:04 |
| bob2 | heh | 13:04 |
| bob2 | on localhost, 'ssh-add', then 'ssh-copyid remoteuser@remotehost' | 13:04 |
| bob2 | er ssh-copy-id | 13:04 |
| spirov92 | bob2: seems to work now, thanks a lot :) | 13:06 |
| bob2 | no worries | 13:07 |
| bialix | smartgpx: you mail arrived, I'll answer later, OK? | 13:19 |
| smartgpx | bialix: it was 'broken' -gvdm has replied. OK for now thanks. | 13:23 |
| Amything | just started to use bazaar, does it make sense to use it to version control mysql database with it? | 13:23 |
| SamB_XP | Amything: not very much sense, I think | 13:26 |
| SamB_XP | don't those tend to be rather large ? | 13:26 |
| SamB_XP | and ... non-textual? | 13:26 |
| SamB_XP | Amything: what about the database do you want to version control ? | 13:28 |
| SamB_XP | Amything: you may find http://ask.metafilter.com/85982/Is-there-a-MySQL-version-control-system-or-something instructive. It doesn't have anything to do with bzr specifically, but it seems to give reasonable advice on the subject ... | 13:31 |
| hackter | hi ! | 14:29 |
| hackter | I have a python module contained in a package of several modules versionned with bzr | 14:30 |
| smartgpx | is there anyone in who understands rich-root-formats and how to stop them causing me grief? | 14:30 |
| * bialix raises a hand | 14:30 | |
| hackter | I would like to move that python module in its own project, versionned separately | 14:31 |
| bialix | hackter: use fastimport plugin and fast-import-filter command | 14:31 |
| hackter | is it possible to do that and keep all history of my python module ? | 14:31 |
| hackter | bialix: hum ok, thank you :) | 14:32 |
| bialix | smartgpx: I have success of using format1 plugin | 14:32 |
| smartgpx | bialix: bzr branch lp:qbzr local_branch - creates branch with branch format 7, repo fmt Packs6. | 14:33 |
| * bialix don't remember what 7 and 6 means | 14:33 | |
| bialix | can you show me output of bzr info please? | 14:34 |
| bialix | smartgpx: perhaps you want to use bzr branch --standalone lp:bzr xxx | 14:34 |
| smartgpx | if I then bzr branch local_branch feature_branch then the feature branch is branch fmt 7 with repo fmt 2a | 14:34 |
| bialix | smartgpx: are you using shared repo in 2a format? | 14:35 |
| smartgpx | and then I can't merge back from modded feature into local! | 14:35 |
| smartgpx | these are simply the defaults chosen by BzrExpl. | 14:35 |
| * bialix trying to reproduce w/o format1 | 14:35 | |
| bialix | ouch | 14:36 |
| bialix | can you file a bug please against explorer? | 14:36 |
| bialix | and provide exact sequence steps to reproduce? | 14:36 |
| bialix | smartgpx: ^ | 14:37 |
| smartgpx | format1 isn't listed on http://bazaar-vcs.org/BzrPlugins | 14:37 |
| smartgpx | bialix: Ok - so I'm not just being dumb... ? | 14:37 |
| bialix | yep, it's not listed | 14:38 |
| bialix | smartgpx: I dunno what's going on, but I can try to reproduce and check if there is bug in explorer | 14:39 |
| bialix | plugin is here https://code.launchpad.net/~bialix/+junk/format1 | 14:39 |
| smartgpx | bialix: it might be that I am accepting the hint from BE to put the feature branch in a shared repo. I'll try as a plain branch.. | 14:39 |
| * bialix nods | 14:40 | |
| bialix | smartgpx: for standalone branches I can't reproduce your problem, even w/o my plugin | 14:41 |
| bialix | but I'm not using BE for testin | 14:41 |
| * bialix trying with explorer | 14:41 | |
| bialix | smartgpx: ok, I see | 14:43 |
| bialix | smartgpx: so you trying to branch via BE, it recommends you to create shared repo, and by default it suggest using 2a format (2.0 default) | 14:44 |
| bialix | that's a problem | 14:44 |
| bialix | problem in BE | 14:44 |
| bialix | smartgpx: we may want to upgrade qbzr trunk to 2a soon, can't say for sure when | 14:45 |
| bialix | smartgpx: som I'd recommend you to do following: | 14:46 |
| smartgpx | bialix: it's OK making feature_branch as a plain branch. | 14:46 |
| smartgpx | Your description is nearly correct - BE recommends shared repo then just creates it as 2a | 14:47 |
| bialix | 1) create shared repo in 1.9 format via BE: Init -> Shared repo -> Format: other -> 1.9 | 14:47 |
| bialix | 2) branch lp:qbzr into this shared repo | 14:47 |
| bialix | 3) branch inside this shared repo won't bother you with recommendations for creating shared repo | 14:48 |
| bialix | 4) ... prpfit? | 14:50 |
| bialix | 4) ... profit? | 14:50 |
| bialix | rats, don't like when typo ruins joke (c) vila | 14:50 |
| Amything | SamB_XP: sry late reply but thanks :) | 15:00 |
| smartgpx | bialix: thanks for your help - branch is up at lp:qbzr and Merge Proposal issued | 15:05 |
| bialix | smartgpx: good! | 15:06 |
| stefano-k | some days ago I started a question about qbzr translation... after my connection gone down... | 15:13 |
| stefano-k | i'm translating qbzr in Italian.. but I have no idea how to translate bzr commands and terms (e.g. commit, bind, branch, working tree, push) | 15:14 |
| bialix | stefano-k: I'd suggesting to look into transaltions for bzr-gtk and/or for similar hg/git tools | 15:15 |
| bialix | stefano-k: also useful to look into svn books translated into Italian and check there | 15:15 |
| bialix | stefano-k: ping | 15:16 |
| stefano-k | bialix: thanks :-) | 15:18 |
| stefano-k | so.. there are no specific guidelines for qbzr | 15:19 |
| bialix | stefano-k: you need consistency | 15:20 |
| bialix | it's very hard to translate DVCS terms to any language != English | 15:21 |
| bialix | I had the same troubles with Russian translation | 15:21 |
| bialix | in the end we setup glossary at ru_bzr group and decided on the desired variants for terms translations | 15:22 |
| bialix | although several terms almost impossible to translate | 15:22 |
| bialix | e.g. push | 15:22 |
| bialix | there is just nothing the same short and expressive in Russian for this term | 15:23 |
| bialix | English is much more compact and technical language | 15:23 |
| bialix | stefano-k: you might start with "mechanical" translation, and then improve it based on feedback of other Italian spoken people | 15:24 |
| stefano-k | in the other hand, you can translate "push", but after you lose the term for the bzr documentation | 15:24 |
| bialix | how's that? | 15:24 |
| bialix | when we translate documentation to Russian we're also using the same glossary | 15:25 |
| bialix | that's why I'm talking about consistency | 15:25 |
| bialix | we have a proverb in Russian: it can be ugly but it should be the same across all places | 15:25 |
| bialix | (this is rough translation) | 15:26 |
| bialix | evening GaryvdM | 15:28 |
| GaryvdM | Hi - Is there a way to rebase a rev from a 2a branch to a 1.19 branch? | 15:29 |
| GaryvdM | Hi bialix | 15:29 |
| jelmer | GaryvdM: not using the rebase plugin at least | 15:29 |
| stefano-k | but if you read the bzr reference, you have "push" command | 15:29 |
| GaryvdM | Ah - smartgpx - you are here | 15:31 |
| GaryvdM | And I see bialix had allready point out that you submitted your branch in the 2a format. | 15:32 |
| smartgpx | Garyvdm: are you saying that what is currently on lp:~smartgpx is in the wrong fmt? | 15:49 |
| smartgpx | I didn't pick up on bialix saying that | 15:49 |
| === bialix_ is now known as bialix | ||
| GaryvdM | bialix: What are your thoughts about https://code.edge.launchpad.net/~craighewetson/qbzr/qrevert/+merge/14626 re pending merges causes all files to be checked | 16:05 |
| bialix | GaryvdM: sorry, have not looked yet | 16:06 |
| bialix | will try later | 16:06 |
| bialix | GaryvdM_: sorry, have not looked yet; will try later | 16:09 |
| GaryvdM_ | Hi smartgpx: sorry - I only saw your question now in the log. My irc is in lossy mode :-( | 16:10 |
| bialix | smartgpx: your branch on LP in 2a format | 16:10 |
| bialix | smartgpx: that's one https://code.launchpad.net/~smartgpx/qbzr/qcommit_typo | 16:10 |
| bialix | please delete it, then push again | 16:10 |
| GaryvdM_ | smartgpx: yes - I could not pull you change because the format is incompatable | 16:10 |
| bialix | GaryvdM_: we need to upgrade to 2a soon, IMO | 16:11 |
| GaryvdM_ | bialix: How about now? | 16:11 |
| bialix | I'm busy at work, if you want to do it -- I'll be happy | 16:11 |
| smartgpx | Well, this newbie contributor is getting confused and demotivated. | 16:12 |
| bialix | smartgpx: please don't! | 16:13 |
| bialix | your change is small enough, we can apply it via diff+patch | 16:13 |
| GaryvdM_ | smartgpx: It seamed like you wanted to learn, but if you want me to I'll do it for you :-) | 16:13 |
| smartgpx | (Can't help being confused.. I;ll shelve the demotivated...) | 16:13 |
| smartgpx | I do want to learn. But there seem to be some artificial barriers. (ref. IGCs mail about community effort.) | 16:15 |
| bialix | smartgpx: I'd blame bzr-explorer who made you drive into wrong direction | 16:16 |
| bialix | but we just need to upgrade qbzr trunk to rich-capable format anyway, sooner or later | 16:16 |
| GaryvdM_ | bialix: do we maybe need to give some notification? | 16:17 |
| bialix | according to official migration doc we don't need to delete old poor-roots trunk, jhust adding new branch in rich-roots and switch branch for trunk series | 16:18 |
| === GaryvdM_ is now known as GaryvdM | ||
| bialix | so, we should send notification after we done | 16:19 |
| smartgpx | No. BE by default made it impossible to merge back even on my own machine. But having kept the fmt such that I could mege back to the local branch I still PUSHed back in 2a. (Is the problem possibly the fmt that LP uses for a new PSUH?) | 16:19 |
| smartgpx | PSUH -> PUSH | 16:19 |
| GaryvdM | smartgpx: When you push to lp, it will have the same format as your local format, by default | 16:20 |
| smartgpx | locally the branch I PUSHed is WT fmt6, Branch fmt7, repo Packs 6 | 16:20 |
| GaryvdM | smartgpx: If that is the case, maybe try pushing it again. to a new location in (like lp:~smartgpx/qbzr/qcommit_typo2) | 16:23 |
| GaryvdM | smartgpx: I'm going to upgrade our branch now, so you don't have to worry about this. | 16:25 |
| GaryvdM | smartgpx: I'll merge your change after I've upgraded. | 16:25 |
| smartgpx | Garyvdm: my branch on lp is already gone | 16:27 |
| * bialix bbl | 16:27 | |
| smartgpx | Garyvdm: right, pushed again using bzr cli this time, and proposed for merge | 16:32 |
| GaryvdM | smartgpx: I've merged it. | 16:35 |
| GaryvdM | smartgpx: Thanks for the fix. (My spelling is really bad :-() | 16:36 |
| smartgpx | Garyvdm: so was the fmt right this time? (if so it points to an issue with BE, no?) | 16:37 |
| GaryvdM | smartgpx: Yes the format was correct. | 16:37 |
| GaryvdM | smartgpx: Are you sure that you did not push it from a different (upgraded) branch? | 16:38 |
| smartgpx | Garyvdm: so if I push the same branch again with BE to a fresh destination can you check the fmt, please? | 16:38 |
| GaryvdM | Sure | 16:38 |
| smartgpx | (actually, it will probably be qpush that is the suspect.) here goes... | 16:39 |
| smartgpx | right - its on ....qcommit_typo3 | 16:40 |
| smartgpx | Garyvdm: do you need a merge proposal, or will that confuse other players? | 16:42 |
| GaryvdM | smartgpx: That was also in the correct format. (see https://code.edge.launchpad.net/~smartgpx/qbzr/qcommit_typo3) | 16:42 |
| GaryvdM | smartgpx: no - don't do a merge proposal | 16:43 |
| GaryvdM | You can see the format near the bottom | 16:43 |
| GaryvdM | it is "Packs 6 (uses btree indexes, requires bzr 1.9)" | 16:43 |
| GaryvdM | Bye | 16:45 |
| === thekorn is now known as RainCT007 | ||
| === Guest98759 is now known as jelmer | ||
| === RainCT007 is now known as sugar_honey | ||
| === sugar_honey is now known as recover | ||
| RenatoSilva | verterok: hi | 19:16 |
| * smartgpx tries an action message | 19:45 | |
| rehanift | Hello, is it safe to use a 2.0 bzr client with a 1.0 server? | 19:58 |
| beuno | rehanift, yes, although not super recommended | 19:59 |
| rehanift | ok, so it will not start using the new format? other user's who use 1.0 bzr clients will not be affected? | 20:00 |
| LarstiQ | rehanift: if you branch a 1.0 branch into a 2.0 repository, it will upgrade | 20:02 |
| LarstiQ | rehanift: but that is not related to version of servers or clients | 20:03 |
| rehanift | so if I do a "checkout" with a 2.0 client from a 1.0 branch, it will keep the remote 1.0 branch format intact correct? | 20:04 |
| LarstiQ | rehanift: yes, as long as you don't check out into a 2.0 repository | 20:05 |
| LarstiQ | rehanift: if you don't use shared repositories, then the format will always be the same | 20:05 |
| rehanift | ok, great | 20:06 |
| rehanift | thank you so much | 20:06 |
| mtaylor | is there a _good_ way to get the diff of just the changes in revision 1186.6.1 ? | 20:12 |
| asabil | bzr diff -c 1186.6.1 ? | 20:13 |
| mtaylor | (in other words - how do I know what the parent is so that I can fill in X in -rX..1186.6.1 | 20:13 |
| LarstiQ | mtaylor: -c | 20:13 |
| mtaylor | really? cool | 20:13 |
| LarstiQ | mtaylor: otherwise, use -r before:1186.6.1..1186.6.1 | 20:13 |
| mtaylor | LarstiQ: double cool--- both are good to know | 20:14 |
| LarstiQ | mtaylor: (lifted from `bzr help revisionspec` btw) | 20:14 |
| * mtaylor hides in corner | 20:14 | |
| LarstiQ | no no, I knew where to look for that :) | 20:14 |
| mtaylor | revisionspecs are very flexible - which is nice... but also has that whole complex thing going on | 20:15 |
| LarstiQ | yeah | 20:15 |
| === {}_ is now known as {0} | ||
| === AnMaster is now known as {}_ | ||
| === r0bby_ is now known as r0bby|android | ||
| === r0bby|android is now known as r0bby | ||
| phoenixz | Hi there, the location where my bzr branch should push to has changed.. How do I update this change in myh branch? | 21:23 |
| user234234 | is this the right place to ask questions related to problems with Bazaar? | 21:23 |
| phoenixz | user234234: Yes | 21:23 |
| user234234 | I am running into a weird error which I can't figure out. While trying to branch my launchpad project, I get the following error: | 21:24 |
| user234234 | "Error while executing branch, [Errno 2] No such file or directory: u'C:/daga/workspace/cogmod2/.bzr/checkout/limbo/new-4/aux.py'-" | 21:24 |
| phoenixz | user234234: but if you want an answer, you do have to ask your question.. | 21:24 |
| user234234 | this happens both with command line and using an plugin for eclipse | 21:25 |
| user234234 | I am using windows 7 | 21:25 |
| user234234 | I tried to run a virtual windows xp on the same computer and then it works fine | 21:25 |
| rar | phoenixz: bzr push --remember /new/location | 21:25 |
| user234234 | also running ubuntu on another machine lets me branch this project fine | 21:26 |
| user234234 | I have googled this error, but cannot find any related cases | 21:26 |
| user234234 | any help would be appreciated | 21:26 |
| rar | stick the bit of bazaar.log related to that operation somewhere we can see it? | 21:27 |
| rar | sorry, .bzr.log | 21:27 |
| rar | not sure where it'll be on 7, bzr version should tell you though | 21:28 |
| === r0bby is now known as r0bby|android | ||
| === r0bby|android is now known as r0bby | ||
| user234234 | ok, that took a little while to find | 21:31 |
| user234234 | Tue 2009-11-10 21:30:52 +0000 | 21:32 |
| user234234 | 0.063 bzr arguments: [u'checkout', u'lp:~joachim-degreeff/cogmod2/0.2.0'] | 21:32 |
| user234234 | 0.078 looking for plugins in C:/Users/user/AppData/Roaming/bazaar/2.0/plugins | 21:32 |
| user234234 | 0.078 looking for plugins in C:/Program Files/Bazaar/plugins | 21:32 |
| user234234 | 0.219 encoding stdout as sys.stdout encoding 'cp850' | 21:32 |
| user234234 | 1.514 bzr-svn: using Subversion 1.5.6 () | 21:32 |
| user234234 | 3.152 falling back to default implementation | 21:32 |
| user234234 | 3.152 failed to load system host keys: [Errno 2] No such file or directory: 'C:\\Users\\user/.ssh/known_hosts' | 21:33 |
| user234234 | [ 3932] 2009-11-10 21:30:56.207 INFO: Connected (version 2.0, client Twisted) | 21:33 |
| user234234 | [ 3932] 2009-11-10 21:30:57.142 INFO: Authentication (publickey) successful! | 21:33 |
| user234234 | [ 3932] 2009-11-10 21:30:57.190 INFO: Secsh channel 1 opened. | 21:33 |
| user234234 | 6.958 creating repository in file:///C:/0.2.0/.bzr/. | 21:33 |
| user234234 | 6.989 creating branch <bzrlib.branch.BzrBranchFormat6 object at 0x01ED3F50> in file:///C:/0.2.0/.bzr/ | 21:33 |
| user234234 | 7.176 Using fetch logic to copy between RemoteRepository(bzr+ssh://bazaar.launchpad.net/~joachim- | 21:34 |
| user234234 | degreeff/cogmod2/0.2.0/.bzr/)(<RemoteRepositoryFormat>) and KnitPackRepository | 21:34 |
| user234234 | ('file:///C:/0.2.0/.bzr/repository/')(<RepositoryFormatKnitPack1>) | 21:34 |
| user234234 | 7.176 fetch up to rev {jdegreeff@b110-pbb116-20091110113205-94b1c062ota3le8b} | 21:34 |
| user234234 | 7.910 opening working tree 'C:/0.2.0' | 21:34 |
| user234234 | 7.956 Traceback (most recent call last): | 21:34 |
| user234234 | File "bzrlib\commands.pyo", line 842, in exception_to_return_code | 21:34 |
| user234234 | File "bzrlib\commands.pyo", line 1037, in run_bzr | 21:34 |
| user234234 | File "bzrlib\commands.pyo", line 654, in run_argv_aliases | 21:34 |
| user234234 | File "bzrlib\builtins.pyo", line 1336, in run | 21:35 |
| user234234 | File "bzrlib\bzrdir.pyo", line 1609, in create_workingtree | 21:35 |
| user234234 | File "bzrlib\workingtree_4.pyo", line 1473, in initialize | 21:35 |
| user234234 | File "bzrlib\transform.pyo", line 2147, in build_tree | 21:35 |
| user234234 | File "bzrlib\transform.pyo", line 2240, in _build_tree | 21:35 |
| user234234 | File "bzrlib\transform.pyo", line 2307, in _create_files | 21:35 |
| user234234 | File "bzrlib\transform.pyo", line 1138, in create_file | 21:35 |
| user234234 | IOError: [Errno 2] No such file or directory: u'C:/0.2.0/.bzr/checkout/limbo/new-4/aux.py' | 21:35 |
| user234234 | 7.956 return code 3 | 21:35 |
| user234234 | thats it | 21:35 |
| user234234 | any ideas? | 21:37 |
| LarstiQ | user234234: no, that looks weird | 21:38 |
| LarstiQ | user234234: (in the future, please don't paste that amount directly to the channel, but use a pastebin service) | 21:39 |
| bialix | windows cannot create file with names conataining con, lpt, com and aux | 21:39 |
| LarstiQ | oh | 21:39 |
| LarstiQ | aux.py | 21:39 |
| LarstiQ | right :/ | 21:39 |
| user234234 | sorry | 21:39 |
| rar | ha! that one went right past me. | 21:39 |
| rar | alexander's is right, you need to call the file summat else. | 21:40 |
| user234234 | really, that's all? | 21:40 |
| rar | yup. | 21:40 |
| user234234 | but why did it work on windos xp I wonder | 21:40 |
| bialix | maybe this file is new? | 21:40 |
| user234234 | no, it has been there all the time | 21:41 |
| rar | it might be silently failing on xp. | 21:41 |
| bialix | I can't create such file on my xp | 21:41 |
| rar | yeah, run `bzr diff` in the branch on xp | 21:42 |
| rar | it'll tell you the file src/aux.py has been removed | 21:42 |
| user234234 | ok, could be | 21:42 |
| user234234 | I'll try to rename it and see if this solves the problem | 21:42 |
| user234234 | thanks for the suggestion! | 21:42 |
| rar | I wish bazaar would tell you if a branch was valid on a given filesystem namespace | 21:43 |
| rar | not that I often need to put code in places that only accept 8.3 | 21:44 |
| bialix | hmm, I forget, is there any way to set append_revisions_only property on remote branch w/o hitchiker? | 21:44 |
| user234234 | indeed, the file aux.py is missing in the folder on XP, so that must be the problem | 21:47 |
| user234234 | cheers for pointing it out | 21:47 |
| hno | How do I get information about pending merges in the current working directory? I.e. revisions being merged and their log messages. | 23:12 |
| mwhudson | hno: bzr st -v | 23:14 |
| mwhudson | hno: has that and some other things | 23:14 |
| hno | mwhudson: Does nothing for me.. same output as bzr st | 23:14 |
| hno | Bazaar (bzr) 1.18.1 | 23:15 |
| lifeless | hno: what does bzr st output | 23:15 |
| mwhudson | hno: then i suspect you don't have pending merges? | 23:15 |
| lifeless | pastebin ftw | 23:15 |
| hno | modified: [list] unknown: [list] | 23:15 |
| lifeless | if thats the lot, you have no pending merges | 23:15 |
| hno | I have. And .bzr/checkout/merge-hashes lists them.. | 23:16 |
| lifeless | hno: why do you think you have pending merges | 23:16 |
| hno | because the changes I have in the tree is from a "bzr merge -c... /path/to/other/tree" | 23:17 |
| lifeless | thats a cherrypick merge, it doesn't get recorded | 23:17 |
| lifeless | you don't have pending merges. | 23:17 |
| hno | gah. | 23:17 |
| hno | why are they recorded in merge-hashes? | 23:17 |
| lifeless | so that bzr revert knows whether it has to make a backup or not | 23:18 |
| hno | so this means I won't get the changelog history of cherrypick merges references in the commit either? | 23:19 |
| lifeless | thats correct | 23:19 |
| hno | Is there any plans on fixing cherrypicks to be more of a proper bzr operation? | 23:20 |
| hno | I mean with this level of tracking we have nothing to build on in bzr to improve compared to the manual merge tracking process we currently use for Squid. | 23:21 |
| hno | getting the cherrypicked revisions recorded would help that a lot.. | 23:23 |
| lifeless | hno: yes, there are plans. No timeline | 23:23 |
| hno | do you know how others are tracking backporting of changes to earlier branches? | 23:24 |
| hno | with bzr.. | 23:25 |
| lifeless | they do merge -c, then commit with a clear message | 23:25 |
| hno | and relying on manually keeping track of what has been backported just as we do.. | 23:26 |
| hno | with a risk of pairing mismatches.. | 23:27 |
| hno | Another related question: Is it possble to prerecord a log message while working on the tree, so it's available on commit? If so then I could script what we need in the log message so that it can be extracted properly by the change tracking.. | 23:29 |
| bob2 | bzr help commit -> -F | 23:30 |
| hno | then I need to script commit as well... was more hoping for something what would get automatically added to the log message template on bzr commit.. | 23:31 |
| lifeless | hno: its possible via a plugin | 23:34 |
| hno | lifeless: An existing one, or by writing a new one? | 23:34 |
| lifeless | there are existing ones, they may not match exactly what you want | 23:35 |
| hno | hopefully at least good enough as starting point. | 23:36 |
| bjp_ | this the right channel to ask a loggerhead question? | 23:38 |
| hno | lifeless: where can I find the existing ones? | 23:39 |
| lifeless | the plugins page lists them all | 23:39 |
| lifeless | bjp_: yes | 23:39 |
| lifeless | s/all/many/ | 23:39 |
| hno | lifeless: Not obvious to me which ones of those may be related to this... | 23:41 |
| lifeless | let me have a look | 23:42 |
| bjp_ | alright, I currently have loggerhead.conf to auto-publish a directory, and am serving it with apache. This works fine and generates URLs like: server/foldername/branchname. | 23:42 |
| bjp_ | I can access the branches fine, but the auto-generated links at the top of the page link to server//branchname | 23:42 |
| bjp_ | so clicking on them goes to an invalid url | 23:42 |
| bjp_ | it's not a serious issue, just annoying, I was wondering if I'm missing something in my .conf file | 23:43 |
| lifeless | AIUI loggerhead.conf is seriousl deprecated | 23:44 |
| lifeless | mwhudson: ^ | 23:44 |
| bjp_ | really? what else would you use? | 23:46 |
| lifeless | bjp_: bzr serve --http <path>, or serve-branches [-- options here] <path? | 23:49 |
| lifeless | hno: sorry, doesn't seem to be a matching plugin these days, I thought there was one | 23:49 |
| hno | lifeless: ok. | 23:50 |
| hno | lifeless: thanks anyway. | 23:50 |
| bjp_ | lifeless: what about for using the daemon? | 23:52 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!