| gutworth | it's a limitation of sftp I believe | 00:02 |
|---|---|---|
| Peng | nyu: Bazaar is indeed tidying things up. | 01:00 |
| Peng | nyu: If you use bzr+ssh://, it can do this efficiently on the server-side, but since it's sftp://, this means downloading, tidying, and re-uploading data. | 01:01 |
| nyu | Peng: ok, thanks | 01:37 |
| Peng | If it didn't do this, performance would slowly degrade over time . . . . . | 01:38 |
| Peng | Anyway, it only winds up packing 10% of the time. | 01:38 |
| Peng | And it's usually only a little data. | 01:38 |
| === abentley1 is now known as abentley | ||
| === BasicPRO is now known as BasicOSX | ||
| saedelaere | puh, i'am stuck with bzr branch and i don't know what sf.net is doing :D | 11:43 |
| saedelaere | this is the output of my bazaar repo on sf.net | 11:43 |
| saedelaere | http://www.pastebin.org/68796 | 11:43 |
| saedelaere | but somehow i can't browse the new branch with http://tv-viewer.bzr.sourceforge.net/bzr/tv-viewer/changes | 11:44 |
| saedelaere | next thing is, i created this branch some days ago when i thought i was ready to release the next stable version. | 11:45 |
| saedelaere | but then i made further changes in the main branch. how can i update the branch stable.081 to the latest revision? | 11:45 |
| saedelaere | ok i see i can access my repo on sf.net via a ssh shell | 12:04 |
| saedelaere | perhaps i can do it there. | 12:05 |
| Peng | saedelaere: Push from the main branch to the stable branch. | 12:15 |
| Peng | saedelaere: Or, depending on how you did things, pull. | 12:16 |
| Peng | (depending on which is most convenient, I mean) | 12:16 |
| bialix | hi Peng | 12:16 |
| saedelaere | i'am confused. perhaps the best thing would be to start from the scratch with bazaar. especially because i made the main development in the root folder. | 12:22 |
| Peng | bialix: Good morning. :) | 12:22 |
| saedelaere | i mean nothing can happen to the local branch i have?! | 12:22 |
| bialix | best wishes to all | 12:23 |
| saedelaere | but what happens if i just delete the .bzr directory on sf.net | 12:23 |
| saedelaere | do i need to run something like bzr-init ? | 12:23 |
| bialix | to create new branch? | 12:24 |
| saedelaere | no, to start from the scratch with my online repo. | 12:25 |
| saedelaere | i started with bazaar like this | 12:25 |
| saedelaere | http://doc.bazaar.canonical.com/latest/en/user-guide/solo_intro.html | 12:25 |
| bob2 | what are you trying to achieve? | 12:26 |
| saedelaere | hm, i created a new branch with [bzr branch] | 12:27 |
| saedelaere | it is located here | 12:27 |
| saedelaere | bzr://christianrapp@tv-viewer.bzr.sourceforge.net/bzrroot/tv-viewer/stable.081 | 12:27 |
| bialix | saedelaere: you may want to create shared repo first with bzr init-repo | 12:27 |
| bialix | hmm, I remember you, you still fighting with sf? | 12:27 |
| bob2 | does sf have any docs on how their bzr hosting works? | 12:27 |
| saedelaere | i think the repo on sf.net is already a shared repo | 12:28 |
| bialix | so make branches within that repo in subdirectories | 12:28 |
| bialix | what's your problem? | 12:28 |
| saedelaere | i want to be able to browse the branch stable.081 via loggerhead. | 12:29 |
| saedelaere | but | 12:29 |
| saedelaere | http://tv-viewer.bzr.sourceforge.net/bzr/tv-viewer/stable.081 | 12:29 |
| saedelaere | does not work | 12:29 |
| saedelaere | but the branch exists | 12:30 |
| bialix | http://tv-viewer.bzr.sourceforge.net/bzr/tv-viewer/changes | 12:31 |
| bialix | tv-viewer is the branch | 12:31 |
| bialix | not a shared repo | 12:31 |
| bialix | stable.081 is also branch | 12:32 |
| bialix | at least bzr info bzr://tv-viewer.bzr.sourceforge.net/bzrroot/tv-viewer/stable.081 wfm | 12:32 |
| bialix | maybe sf.net does not support multiple branches in their loggerhead? | 12:32 |
| bialix | saedelaere: I'd delete the branch from bzr://tv-viewer.bzr.sourceforge.net/bzr/tv-viewer | 12:33 |
| bialix | and keep there only shared repo | 12:33 |
| bialix | and put your main branch to bzr://tv-viewer.bzr.sourceforge.net/bzr/tv-viewer/trunk | 12:33 |
| bialix | saedelaere: do you have sftp/ssh access to your repo? | 12:34 |
| saedelaere | ok this sounds interesting. and where do i put other branches? in /trunk | 12:34 |
| saedelaere | bialix: yes, ssh | 12:34 |
| bialix | other branches at the same level | 12:35 |
| bialix | bzr://tv-viewer.bzr.sourceforge.net/bzr/tv-viewer/branchA | 12:36 |
| bialix | bzr://tv-viewer.bzr.sourceforge.net/bzr/tv-viewer/branchB | 12:36 |
| bialix | etc | 12:36 |
| bialix | does it make sense for you? | 12:36 |
| bialix | saedelaere: if you dare enough you can delete the branch from bzr://tv-viewer.bzr.sourceforge.net/bzr/tv-viewer/ | 12:38 |
| bialix | you need to delete directory bzr://tv-viewer.bzr.sourceforge.net/bzr/tv-viewer/.bzr/branch/ | 12:38 |
| bialix | and keep other directories inside .bzr intact | 12:39 |
| saedelaere | ah ok, so now i go to my repo with ssh. | 12:39 |
| saedelaere | how do i get my main branch fom /tv-viewer/ to /tv-viewer/trunk | 12:39 |
| bialix | with bzr branch | 12:39 |
| bialix | or push | 12:39 |
| bialix | do you have local copy? | 12:39 |
| saedelaere | yes local copy is here | 12:39 |
| bialix | so delete the .bzr/branch, then push to trunk | 12:40 |
| bialix | delete on server | 12:40 |
| bialix | keep local | 12:40 |
| saedelaere | ok first delete the directory then push to trunk, | 12:40 |
| saedelaere | i'll try that, wait a second | 12:41 |
| saedelaere | before i issue the command. should i delete the stable.081 directory first? | 12:42 |
| saedelaere | bialix:http://www.pastebin.org/68805 | 12:43 |
| bialix | no, keep it | 12:44 |
| bialix | it's a valid branch | 12:44 |
| saedelaere | bialix: http://tv-viewer.bzr.sourceforge.net/bzr/tv-viewer/ | 12:47 |
| saedelaere | this is looking very good | 12:47 |
| bialix | hooraah | 12:47 |
| bialix | is it what you want? | 12:48 |
| bialix | Peng: does loggehead understand nested branches? | 12:48 |
| saedelaere | yes i think so | 12:49 |
| bialix | :-) | 12:50 |
| saedelaere | bialix: thank you very much | 12:50 |
| saedelaere | ok one more question :D | 12:50 |
| bialix | always happy to help | 12:50 |
| bialix | try | 12:50 |
| Peng | bialix: Like, one branch inside another? | 12:52 |
| bialix | Peng: yep | 12:52 |
| Peng | bialix: IIRC, it will work fine, but there obviously won't be any directory listing page showing the inner branch. | 12:52 |
| Peng | bialix: So you'll have to enter the URL manually. | 12:52 |
| saedelaere | when i now make changes to stable.081. e.g. for a bugfix release. will the changes also appear in the log history of the branch trunk? | 12:53 |
| bialix | I guess the problem of saedelaere was somehow related to that fact | 12:53 |
| bialix | saedelaere: no | 12:53 |
| Peng | (Not sure if there's an open bug about that.) | 12:53 |
| saedelaere | i think i should read more about the concept of a shared repository. | 12:53 |
| bialix | http://doc.bazaar.canonical.com/latest/en/user-guide/zen.html#each-branch-has-its-own-view-of-history | 12:53 |
| bialix | saedelaere: shared repository is just storage | 12:54 |
| bialix | big black box where branches keep their revisions | 12:54 |
| bialix | but every branch has its own history | 12:54 |
| Peng | saedelaere: It is purely a storage optimization, not a "concept". | 12:54 |
| bialix | yes | 12:55 |
| saedelaere | ok, i see. but now for example. i have r100 in one branch and revision 100 in another . when releasing the program they will both have the same revision? but the contect can be totally different | 12:56 |
| saedelaere | s/contect/content | 12:56 |
| Peng | saedelaere: Internally, bzr uses revision IDs. The simple numeric revision numbers are only a convenience, and only apply to that individual branch. | 12:57 |
| Peng | Have you read the tutorial? | 12:57 |
| saedelaere | Peng: this one? | 12:58 |
| saedelaere | http://doc.bazaar.canonical.com/latest/en/tutorials/tutorial.html | 12:58 |
| Peng | I dunno. Whatever. | 12:58 |
| saedelaere | i think so, but this was some time ago, and meanwhile bazaar worked as i needed it. but i will read it again | 12:59 |
| saedelaere | so thanks again for all your help! i think i can manage it from here. have a nice day... | 13:02 |
| Peng | You too. :) | 13:03 |
| bialix | read the Zen document I've linked above | 13:03 |
| maxb | Is anyone else running Ubuntu lucid (or for that matter something else) and getting "Module pygments was already imported from ...." warnings when running bzr? | 13:21 |
| seldomrw2 | hi there, I'm looking for help using bzr explorer on Windows | 13:22 |
| seldomrw2 | look like it canot find my ssh public key | 13:22 |
| seldomrw2 | anoyone? | 13:24 |
| seldomrw2 | I'm using open ssh on Windows, I managed to make bzr work from the command line by setting the HOME environment variable to my user folder, but the explorer cannot pick it up correctly | 13:26 |
| bialix | heya GaryvdM! | 13:27 |
| GaryvdM | Hi bialix | 13:27 |
| GaryvdM | Belated Merry Christmas. | 13:27 |
| bialix | and you too | 13:28 |
| bialix | actually for me it will be Jan 7 | 13:28 |
| bialix | hope you're ok :-) | 13:29 |
| GaryvdM | Ah Jan 7 = christmas for Eastern Orthodox Churches | 13:29 |
| GaryvdM | I'm well. You? | 13:29 |
| seldomrw2 | sorry, would anyone be so kind to help me out? | 13:30 |
| GaryvdM | seldomrw2: just got here. Please repeat you question | 13:30 |
| GaryvdM | *your | 13:30 |
| seldomrw2 | I'm having issues with bzr explorer on Win, looks like it cannot pick up my ssh keys | 13:31 |
| seldomrw2 | I managed ot make bzr work from the command line by setting the HOME env var to my user folder | 13:32 |
| seldomrw2 | but not on bzr explorer | 13:32 |
| bialix | GaryvdM: to much work for the end of the year | 13:32 |
| bialix | still working | 13:32 |
| bialix | have no time for hacking | 13:32 |
| bialix | seldomrw2: are you running explorer form command-line or via shortcut? | 13:33 |
| bialix | *from | 13:33 |
| GaryvdM | seldomrw2: Where did you set that HOME var? If through Windows Computer properties Dialog, you will need to restart BE | 13:33 |
| GaryvdM | bialix: I know the feeling. I worked right untill the 24th Dec. Going back to work tomorrow :-( | 13:34 |
| bialix | if you said it working for you in command-line, will it work if you run bzr explorer from command-line? | 13:35 |
| bialix | GaryvdM: :-( | 13:35 |
| seldomrw2 | nope | 13:35 |
| bialix | does your ssh key required password? | 13:35 |
| bialix | why don't you use ssh-agent? | 13:36 |
| seldomrw2 | it does. I cannot make ssh-agent run on Windows honestly | 13:36 |
| bialix | well, honestly I'm using pageant on Windows | 13:36 |
| seldomrw2 | I mean it starts but then I cannot add my keys | 13:36 |
| bialix | and paramiko (default ssh client for bzr) | 13:37 |
| bialix | have no experience with openssh | 13:37 |
| seldomrw2 | I hadn't heard of paramiko | 13:37 |
| bialix | are you running bzr.exe from installer? | 13:37 |
| seldomrw2 | I don't think it ships in the Win version though | 13:37 |
| seldomrw2 | yes, the Win installer | 13:38 |
| bialix | paramiko bundled there by default | 13:38 |
| seldomrw2 | let me check | 13:38 |
| bialix | paramiko is the python library | 13:38 |
| bialix | https://launchpad.net/paramiko | 13:38 |
| seldomrw2 | I thought bzr was using the open ssh version I have installed along with git | 13:39 |
| bialix | it should use paramiko by default | 13:39 |
| bialix | but maybe you have to use env variable BZR_SSH=paramiko to force it | 13:40 |
| seldomrw2 | do you know how to configure it? | 13:40 |
| seldomrw2 | yes, will try | 13:40 |
| bialix | GaryvdM: just buy book on Qt4 :-P | 13:48 |
| bialix | GaryvdM: it's about C++ programming but now I finally learn the right way | 13:48 |
| seldomrw2 | bialix, looks like that env var does the job, is there a way to let bzr pick it up automatically ithout starting the explorer from a batch file? | 13:48 |
| bialix | seldomrw2: set this var via Start - Settings - System ? | 13:49 |
| bialix | Start - Settings - Control Panel - System | 13:49 |
| bialix | then Advanced - Environment Variables | 13:50 |
| === ereslibre_laptop is now known as ereslibre | ||
| maxb | Anyone around who happens to know the proper way to submit changes for bzr-rewrite? | 19:04 |
| maxb | It seems that Launchpad MPs are not used there | 19:04 |
| === jelmer_ is now known as jelmer | ||
| === khmarbaise_ is now known as khmarbaise | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!