| Noldorin | is there any short version of bzr help? | 00:20 |
|---|---|---|
| Noldorin | how do i diff two different branches at different revisions? | 01:05 |
| Noldorin | ...is anyone here alive? :-P | 01:57 |
| AuroraBorealis | i am | 01:58 |
| Noldorin | good to know | 01:59 |
| Noldorin | how do i diff two different branches at different revisions? | 02:01 |
| === AuroraBorealis is now known as aurora|away | ||
| axatrikx | can anyone suggest any good books for bug fixing in launchpad? | 05:18 |
| === aurora|away is now known as AuroraBorealis | ||
| === kgoetz is now known as Kamping_Kaiser | ||
| Noldorin | how do i diff two different branches at different revisions? | 12:10 |
| maxb | Something like -r 123:abc..456:def I'd expect | 12:14 |
| Noldorin | maxb, revision:branch format? | 12:21 |
| maxb | yes | 12:21 |
| maxb | bzr help revisionspec for more info | 12:22 |
| Noldorin | ok cheers | 12:24 |
| zulax | we have 2 projects, 6 ppl | 13:16 |
| zulax | and all collaborators will be working on a window machine | 13:17 |
| zulax | but i would like to have the repos on ubuntu | 13:17 |
| zulax | is bazaar right choice for me? | 13:17 |
| zulax | and i m hoping tortoisebzr will let us easily browse/push/pull repos without having the need to install a bazar-server | 13:18 |
| vila | zulax: If bzr is installed on the ubuntu machine, you already have the simplest setup for a server. Configure ssh and you're done. | 13:20 |
| zulax | ok | 13:21 |
| vila | zulax: setting up ssh clients on windows is only slightly harder (but you may already have that) | 13:21 |
| zulax | would tortoisebzr take care of that? | 13:22 |
| zulax | or do i need putty like | 13:22 |
| vila | yup, putty like and then tortoisebzr should work | 13:22 |
| zulax | ok, | 13:22 |
| zulax | we have svn but i dont think its built for collaboration | 13:22 |
| zulax | and git is slightly more complex | 13:23 |
| zulax | and lack of windows support | 13:23 |
| * vila nods | 13:23 | |
| wilx | Hi. | 16:44 |
| wilx | What am I doing wrong with fast-import? | 16:45 |
| wilx | http://codepad.org/O1k6lcKP | 16:45 |
| wilx | See the paste. | 16:45 |
| wilx | I have installed the module into ~/.bazaar/plugsin/fastimport and I have added the path... | 16:45 |
| === mnepton is now known as mneptok | ||
| pzn | I'm an old-style programmer from cvs era. I did the cvs->svn step some years ago, now I'll give a try to bzr. can someone recommend a quickstart to brz for someone that is used to svn? | 18:28 |
| pzn | sorry for the bad english: does bzr supports this development model: personal merge can be made by anyone, blessed maintrunk merge can be made by anyone (but it has to be someone else). I mean that if userA requested a bless, then userB userC anyone (except userA) can bless. if userB requests a bless, then userA, userC, ... can bless it | 18:37 |
| pzn | maybe I should have read more docs before asking my previous question... | 18:37 |
| pzn | does using debian squeeze bzr version (2.1.2) will be good for most projects, or does this old version misses some main and good new features from 2.4 version? | 18:42 |
| fullermd | That sounds like a development ruleset, not so much a VCS thing. I s'pose you could loosely enforce it with hooks some way or other if you tried... sounds more trouble than it's worth. | 18:49 |
| === yofel_ is now known as yofel | ||
| fullermd | 2.1 should _work_ OK. But it's a fair ways back; 2.4 will have rather better performance, and there've been a fair number of features/etc since then. | 18:53 |
| pzn | fullermd, tks! better impose some "by mouth agreement" enforcement, than "hook software enforcement", if that is what I understood | 18:59 |
| pzn | fullermd, for regular workflow (sorry for the svn terms) create, checkout, update, commit, merge, I'll have no problem with 2.1, ok? | 19:00 |
| fullermd | Well, I was gonna go with "pair of pliers and a blowtorch", myself, but whatever works ;) | 19:00 |
| fullermd | I'm not aware of any showstopper bugs in up to date 2.1.x, thought that may not mean much. But certainly the workflow would be the same, so it's at least good enough to experiment with. | 19:01 |
| pzn | will bzr work ok for "binary" files (just for version control, not for diff between versions) like spreadsheets or pdf files? | 19:02 |
| pzn | fullermd, it took me some minutes to understand "pair of pliers and a blowtorch" in my language, but google helped me :-D | 19:03 |
| fullermd | As long as they're not too big. Presumably you're talking about sub-few-dozen-megs. | 19:03 |
| pzn | fullermd, in current SVN, 10Mb is the bigger one and it has a 20 different revisions (2000 revisions in full project head). I don't intend to put iso CD or iso DVD images on bzr :-) | 19:07 |
| fullermd | No, that's a significant difference between bzr and systems like SVN/CVS. The only granularity you deal with is the branch; neither more nor less. | 19:16 |
| pzn | so you mean that people that work with documentation will need to have the full project on their computers... that is bad for me... | 19:16 |
| pzn | but if that gets really bad, I can workaround by creating one repository "/project-sourcecode" and another repository "/project-doc" | 19:18 |
| pzn | I didn't get the idea behind "use of memory"... suppose I do an "get from server" in the full project. then I open "gimp" to edit an jpg binary file of the project. then I open "openoffice-calc" to edit an spreadsheet. why would it use several times in memory? | 19:20 |
| fullermd | Well, for instance, packing up diffs when you commit/etc has to hold at least an "old" and "new" copy in memory, plus whatever is taken up by the differences. | 19:30 |
| pzn | fullermd, ok, got the point. the memory usage is only at "commit" operation. no problem | 19:37 |
| fullermd | Well, at various others to. I wouldn't attempt to compile a complete list. | 19:38 |
| pzn | fullermd, thanks for your help. I'll go home now. bye | 19:45 |
| AuroraBorealis | what does "bzr: Error 5" mean? o.o | 20:33 |
| fullermd | It's like error 4, but more so. | 20:36 |
| AuroraBorealis | apparently. | 20:36 |
| AuroraBorealis | (aka error codes are the worst things ever) | 20:36 |
| AuroraBorealis | i just got this and i dunno if i should do something about it haha | 20:37 |
| AuroraBorealis | bzr: ERROR: [Error 5] C:/Users/Mark/Code/bzr/python/FASubmissionScraper/trunk/.bzr/branch/lock/releasing.fb82ujn47r8758ue2z3g.tmp/* | 20:37 |
| fullermd | On my system, errno 5 is EIO... | 20:37 |
| * fullermd has no idea how consistent that would be... | 20:37 | |
| AuroraBorealis | as in it couldn't read the file? | 20:37 |
| fullermd | Usually something like that. | 20:38 |
| fullermd | Seems kinda odd that a file would be called '*'. | 20:39 |
| AuroraBorealis | yeah | 20:39 |
| AuroraBorealis | and that there is no stack trace either | 20:39 |
| fullermd | Is it happening more than once? | 20:40 |
| AuroraBorealis | no | 20:41 |
| AuroraBorealis | but i have been having problems (in earlier problems of bazaar) where the lock file doesn't get deleted | 20:41 |
| fullermd | I think that branch/lock/ directory should be empty (but extant) if you don't have anything running. Any droppings in it? | 20:41 |
| fullermd | I think a common suckage source on Windows has been that (a) you can't delete a file that's open, and (b) virus scanners have a tendancy to open files for arbitrary lengths of time. | 20:42 |
| AuroraBorealis | although my problem was in the ~/.bazaar/lock directory | 20:43 |
| AuroraBorealis | not the actual branch ones | 20:43 |
| AuroraBorealis | annnnd opening that location makes explorer say "location is not accessible: access is denied" | 20:43 |
| AuroraBorealis | oh god, "unable to display current owner" | 20:45 |
| AuroraBorealis | so now i have a rogue folder that i am unable to delete ;< | 20:51 |
| zulax | i just setup up apt-get install bzr on my ubuntu | 22:35 |
| zulax | then i installed bzr on windows machine | 22:35 |
| zulax | can i now browse the repo on ubuntu from windows? | 22:35 |
| === thomi|laptop is now known as thomi | ||
| === AuroraBorealis_ is now known as AuroraBorealis | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!