| mrooney | Any particular reason bzr needs a lock to do a [c]diff? | 00:56 |
|---|---|---|
| mrooney | I frequently find that I am committing and forget something about a change, so try to do a diff in another terminal, but I can't :[ | 00:57 |
| mrooney | and if I exit I lose the commit message so far | 00:57 |
| lifeless | mrooney: yah there is a file that commit writes to that diff needs to read | 01:09 |
| lifeless | we will fix this, but for now 'commit --show-diff' | 01:10 |
| mrooney | lifeless: thanks I'll give that a try! | 01:14 |
| mrooney | huh I typo'd it to --show-dif and it still worked, interesting | 01:16 |
| mrooney | lifeless: aw man no --show-cdiff :) | 01:17 |
| mrooney | I guess most things might not support that anyway | 01:17 |
| === Sorcy is now known as Ycros | ||
| jonnydee | hi :) -- can anybody tell me why I get a "bzrlib version doesn't match the bzr program" on intrepid with bzr-1.11? | 03:07 |
| jonnydee | no? | 03:12 |
| nDuff | jonnydee, probably means what it says -- perhaps you have either a bzr program or a copy of the library sitting around somewhere from an old install. | 03:42 |
| Peng_ | "bzr version" will help tell you where everything is | 03:47 |
| jonnydee | but the strange thing is that I uninstalled all bzr related things and I made sure no bzrlib existed. but after I install bzr-1.11 again I get the same error... | 03:49 |
| jonnydee | The message is "bzrlib from ['/usr/lib/python2.5/site-packages/bzrlib'] is version (1, 11, 0, 'final', 0)" | 03:50 |
| nDuff | jonnydee, then your bzrlib is fine, but your bzr executable is old | 03:50 |
| jonnydee | but I get bzr from "deb http://ppa.launchpad.net/bzr/ubuntu intrepid main" | 03:52 |
| Peng_ | jonnydee: grep _script_version `which bzr` | 03:56 |
| Peng_ | Can't out-of-date extensions also cause error messages like that? | 03:56 |
| nDuff | Peng, ...hmm -- I think you're right. | 03:57 |
| jonnydee | Oh, this one returns: | 03:57 |
| Peng_ | Err, plugins. Oops. | 03:57 |
| jonnydee | _script_version = (1, 9, 0) | 03:57 |
| jonnydee | if bzrlib.version_info[:3] != _script_version: | 03:57 |
| Peng_ | jonnydee: Then you've got an old copy of the bzr script around somewhere. 'which bzr' to see where. Or maybe the deb is broken... | 03:58 |
| jonnydee | Peng_: You are right. I've got a bzr in my ~/bin folder... | 03:59 |
| Peng_ | Well, there you go. | 04:00 |
| jonnydee | Thank your very much Peng_ and also to nDuff. What a shame... I'm sorry... | 04:00 |
| === herb__ is now known as herb | ||
| === dereine[OFF] is now known as dereine | ||
| === mark1 is now known as markh | ||
| === mark1 is now known as markh | ||
| GPH-Laptop | 10.4 doesn't get any love anymore :( | 09:24 |
| GPH-Laptop | Mac OS X, that is | 09:25 |
| === thekorn_ is now known as thekorn | ||
| === dereine is now known as dereine[OFF] | ||
| === mark1 is now known as markh | ||
| === dereine[OFF] is now known as dereine | ||
| === dereine is now known as dereine[OFF] | ||
| === dereine[OFF] is now known as dereine | ||
| === mark1 is now known as markh | ||
| === dereine is now known as dereine[OFF] | ||
| xnox | Hello everyone. Two branches don't have no common ancestor and I can't figure out how to specify base revision. I've tried -r X -r Y and -r X Y and it fails =( | 13:41 |
| xnox | Saying extra arguments | 13:42 |
| xnox | or still unspecified base revision | 13:43 |
| LarstiQ | xnox: trying to do what? | 13:43 |
| xnox | I have two branches, one from me and one from the other guy. We were doing very similar things from scratch (debian packages). Now I want to merge our two branches and create mainline to base our future work on. | 13:45 |
| LarstiQ | xnox: you could try `bzr merge -r0..-1 path/to/other/branch` | 13:45 |
| xnox | But to merge one into the other I need to specify a base revision (according to the error message). | 13:45 |
| xnox | LarstiQ: Thanks that worked! | 13:47 |
| nebuchadnezzar | hello, after upgrading bzr to 1.11, I try to upgrade a branch from svn to 1.9-rich-root, and now I can not pull any more, I have "branches have diverge use merge" and when merging I get no common ancestor :-/ | 13:47 |
| nebuchadnezzar | any hints ? | 13:48 |
| LarstiQ | nebuchadnezzar: could you pastebin the commands and their output? | 13:48 |
| LarstiQ | nebuchadnezzar: also, why did you decide to upgrade to 1.9-rich-root? | 13:48 |
| nebuchadnezzar | LarstiQ: to give it a test | 13:49 |
| alf82 | hello, I have a workflow question with bzr/launchpad. Let's say you have the 'trunk' branch used for development and you release eg 0.1 | 13:50 |
| === fawek_ is now known as fawek | ||
| alf82 | and create a 0.1 series/branch. Where do you continue development then? On the trunk and merge the changes into the 0.1 branch once in a while | 13:51 |
| alf82 | or on the 0.1 branch and merge the changes into trunk every now and then? | 13:52 |
| LarstiQ | alf82: there are multiple things you could do. In general, I'd say you'd release 0.1 and don't touch it after that. | 13:52 |
| LarstiQ | alf82: could you explain your situation a bit more? | 13:53 |
| LarstiQ | nebuchadnezzar: how's that pastebin coming along? | 13:53 |
| alf82 | LarstiQ: Well, I have a 'trunk' branch which has been the main (and only) development branch so far (except for feature branches). | 13:55 |
| alf82 | The project is at the point of its first 0.1 release and I don't know exactly how to handle that. Should I create a separate 0.1 for the development | 13:56 |
| alf82 | of the 0.1.x series? | 13:56 |
| LarstiQ | alf82: do you expect 0.1.x and trunk to diverge a lot? | 13:57 |
| alf82 | LarstiQ: no | 13:57 |
| LarstiQ | alf82: say, Samba 3 and 4 both have active development and releases at the same time | 13:57 |
| LarstiQ | alf82: I'd just stick with trunk then | 13:58 |
| alf82 | LarstiQ: ok, that's what I was thinking. In LP does it make sense to register a 0.1 series that also uses the 'trunk' branch? | 14:00 |
| === dereine[OFF] is now known as dereine | ||
| alf82 | LarstiQ: or I shouldn't use series at all? | 14:00 |
| LarstiQ | alf82: I haven't checked lp's docs on series in a while, but Bazaar uses a series per release to group release candidates and possibly bug fix releases | 14:02 |
| nebuchadnezzar | LarstiQ: http://pastebin.com/m5616edd9 <-- I try with a pack-0.92-subtree branched-from-svn | 14:03 |
| LarstiQ | alf82: so all regular activity goes on on trunk | 14:03 |
| nebuchadnezzar | http://pastebin.com/d499880c <-- here is what the merge output too | 14:03 |
| LarstiQ | nebuchadnezzar: your merge uses a different location than the pull | 14:04 |
| LarstiQ | ah no, I was looking crooked | 14:05 |
| nebuchadnezzar | ;-) | 14:05 |
| LarstiQ | nebuchadnezzar: if you look at `bzr missing` output, they don't share any revision, right? | 14:05 |
| LarstiQ | nebuchadnezzar: I find it very unlikely this has anything to do with 1.9-rich-root | 14:06 |
| LarstiQ | nebuchadnezzar: more with a change in bzr-svn, or the path you're pointing bzr-svn at | 14:06 |
| LarstiQ | nebuchadnezzar: you're using bzr-svn 0.4? | 14:06 |
| nebuchadnezzar | LarstiQ: I'm downgrading bzr to 1.5 | 14:08 |
| LarstiQ | nebuchadnezzar: that too, should not have any impact. | 14:11 |
| nebuchadnezzar | LarstiQ: I downgrade bzr to 1.5 and bzr-svn to 0.4, pull wored | 14:12 |
| nebuchadnezzar | worked | 14:12 |
| LarstiQ | nebuchadnezzar: before you downgraded, what bzr were you using? | 14:12 |
| LarstiQ | ehm | 14:12 |
| LarstiQ | bzr-svn | 14:12 |
| nebuchadnezzar | 1.11 | 14:12 |
| nebuchadnezzar | from debian experimental | 14:12 |
| nebuchadnezzar | 0.5 | 14:12 |
| nebuchadnezzar | 0.5.0~rc1+bzr2300-1 | 14:13 |
| LarstiQ | nebuchadnezzar: if you were using 0.5rc[12], then yes, it produces different revisions than 0.4 does. | 14:13 |
| LarstiQ | nebuchadnezzar: so, nothing to do with bzr 1.11 or 1.9-rich-root. This is purely bzr-svn 0.4 vs 0.5 | 14:13 |
| nebuchadnezzar | ok | 14:13 |
| nebuchadnezzar | LarstiQ: my cfengine3 repository is pack-0.92-subtree | 14:14 |
| LarstiQ | nebuchadnezzar: that's fine, but the format has no impact on the issue you were experiencing | 14:14 |
| LarstiQ | nebuchadnezzar: see UPGRADING from bzr-svn 0.5 | 14:15 |
| nebuchadnezzar | ok, thanks | 14:15 |
| LarstiQ | nebuchadnezzar: basically, to be faster/smarter, 0.5 introduces new svn-revision-to-bzr-revision mappings | 14:15 |
| LarstiQ | in order to use those, it has to be incompatible with prior mappings. You can optionally chose to use the old mappings, but you won't gain any of the advantages of the new one then. | 14:16 |
| LarstiQ | It is possible to use a 0.4 and a 0.5 client at the same time against svn, but you can not interact directly between the bzr branches created that way | 14:16 |
| nebuchadnezzar | LarstiQ: I saw that in the documentation, thanks | 14:19 |
| nebuchadnezzar | bzr svn-upgrade and now it's ok | 14:19 |
| LarstiQ | nebuchadnezzar: cool | 14:22 |
| nebuchadnezzar | thanks | 14:23 |
| === Pilky_ is now known as Pilky | ||
| === dereine is now known as dereine[OFF] | ||
| alf82 | LarstiQ: thanks for the tips (yeah, a little delayed, I know)! | 16:58 |
| === dereine[OFF] is now known as dereine | ||
| === dereine is now known as dereine[OFF] | ||
| === dereine[OFF] is now known as dereine | ||
| bialix | LarstiQ: hi | 18:10 |
| LarstiQ | bialix: hello | 18:10 |
| bialix | I'm curious about your opinion on scmproj | 18:11 |
| LarstiQ | bialix: I condensed the notes a bit, but am still not entirely done. So I'll just give you the raw thing (with repetitions et al) and the more condensed thing | 18:11 |
| LarstiQ | bialix: I think it could be very useful for me. | 18:12 |
| bialix | that's ok. I moving new format forward | 18:12 |
| bialix | unfortunately new format will introduce many changes | 18:12 |
| bialix | and ATM we don't have auto-upgrade | 18:12 |
| LarstiQ | bialix: In your config-manager comparison you state you need more than organizing branches. I'd be interested to hear what you need more. (So far, what would be harder to do with nested trees is the ALT style config switching) | 18:13 |
| LarstiQ | evening kfogel | 18:13 |
| bialix | well, config-manager != nested branches | 18:13 |
| bialix | or nested trees, perhaps | 18:14 |
| LarstiQ | sorry, I made a thought leap there | 18:15 |
| bialix | I think without ability to work on the entire project -- it's just many branches accidentally put in one directory | 18:15 |
| bialix | I want to run status, commit, diff, log forthe entire pject | 18:16 |
| bialix | project, sorry | 18:16 |
| LarstiQ | bialix: right, nested trees do that | 18:16 |
| LarstiQ | and where they don't, have it as a design goal | 18:16 |
| LarstiQ | but progress has been lacking, scmproj has more steam going for it to accomplish those goals | 18:17 |
| bialix | LarstiQ: if there will be already implemented nested trees -- unlikely I'll start this plugin | 18:17 |
| * LarstiQ nods | 18:17 | |
| bialix | also, I simply don't understand how nested trees will be stored on the server | 18:17 |
| LarstiQ | bialix: scmproj does have features I think are harder to do with a different solution | 18:17 |
| bialix | you said about graph recalculation | 18:17 |
| LarstiQ | bialix: that was for by-value trees | 18:18 |
| LarstiQ | bialix: so yeah, scmproj is here right now, and that's a big plus | 18:18 |
| bialix | yes, and I think nested by ref has bigger sense for me and my use cases | 18:19 |
| bialix | but I can't grok their internal details yet | 18:19 |
| bialix | LarstiQ: and I hope when nested will be supported in bzrlib, I can use them from scmproj | 18:21 |
| LarstiQ | bialix: cool | 18:21 |
| LarstiQ | bialix: mail sent | 18:21 |
| bialix | big thanks | 18:22 |
| * bialix bbiab (dinner) | 18:22 | |
| bialix | LarstiQ: wow, this notes are VERY useful. Big thanks | 18:46 |
| LarstiQ | bialix: much obliged :) | 18:46 |
| LarstiQ | bialix: the thoughts in my head concern your question about 'clunky' | 18:46 |
| LarstiQ | bialix: I can sort of see his point, but I haven't yet found how to clearly explain that. | 18:47 |
| bialix | yes, I think now I understand "clunky" better | 18:47 |
| bialix | my plans for 0.4.5 are to change many "clunky" points | 18:48 |
| bialix | and as AmanicA mentioned: better catch and report internal errors | 18:50 |
| LarstiQ | bialix: one thing that would be nice, is that if there is enough information in the general sections, I wouldn't need to have a seperate section for each component. | 18:50 |
| AmanicA | hi | 18:50 |
| LarstiQ | AmanicA: evening :) | 18:50 |
| bialix | привет | 18:51 |
| bialix | hi dude | 18:51 |
| AmanicA | :) | 18:51 |
| LarstiQ | bialix: you'll see in my project.cfg there is a lot of repetition, and the notes you'll see a KeyError on 'mqueue' | 18:51 |
| bialix | LarstiQ: I think very soon I'll be ready to show new config format. There is many improvements. I'll use your notes and convert them to bug reports to work on | 18:52 |
| LarstiQ | bialix: ok :) | 18:52 |
| bialix | I hope in the mid of Feb | 18:54 |
| bialix | generic [COMPONENTS] section was suggested (and implemented IIRC) by AmanicA | 18:55 |
| bialix | we need just bring there more options | 18:55 |
| bialix | LarstiQ: yeah, I see your point. In the components sections you have only FORMAT = rich-root-pack; :-) | 18:57 |
| bialix | I've filed this as bug 322499 | 18:58 |
| ubottu | Launchpad bug 322499 in bzr-scmproj "[COMPONENTS] section should support default values for FORMAT and VCS options" [Low,Confirmed] https://launchpad.net/bugs/322499 | 18:58 |
| LarstiQ | bialix: yeah, in this case all the components are rather uniform, yet I still like having them as seperate branches | 19:00 |
| * bialix nods | 19:01 | |
| bialix | LarstiQ: one side question: you said: "I made a thought leap there"; what it means: "thought leap"? | 19:10 |
| LarstiQ | bialix: skipping (talking about) several steps in a thought process | 19:11 |
| LarstiQ | bialix: so to amend that: I read the config-manager vs scmproj, and that made me think of nested-trees vs scmproj | 19:12 |
| bialix | :-) | 19:12 |
| bialix | I have such comparison | 19:12 |
| bialix | but it's incomplete | 19:12 |
| LarstiQ | bialix: from talking to you, I know what I wanted to know | 19:13 |
| bialix | http://bazaar.launchpad.net/~bialix/bzr-scmproj/format-change/annotate/head%3A/docs/vs-nested-trees.txt | 19:13 |
| bialix | may be I'm wrong about initial configuration in the nested trees. but I'm still don't read all sources | 19:14 |
| LarstiQ | bialix: unfortunately, at work I've been switched to coding Java Server Faces (entirely seperate cient project), so I don't have as much opportunity to try scmproj on our regular work stuff | 19:14 |
| bialix | ok, np | 19:15 |
| bialix | LarstiQ: I hope you still can share some knowledge about nested trees | 19:16 |
| bialix | nevertheless of java faces | 19:16 |
| LarstiQ | bialix: of course, I just need to look everything up :) | 19:18 |
| LarstiQ | bialix: I'm interested to hear what abentley is planning | 19:18 |
| bialix | :-) | 19:18 |
| LarstiQ | bialix: what do you mean with 'the initial configuration'? | 19:18 |
| bialix | LarstiQ: this is related to my lack of understanding of nested by ref. How user can recreate nested project from standalone branches? | 19:20 |
| bialix | if these brances hosted on the central server, for example | 19:20 |
| LarstiQ | bialix: Right | 19:20 |
| LarstiQ | bialix: there are still open questions here I think | 19:21 |
| bialix | before bzr I've used CVS very heavily. And we're used CVS modules too | 19:21 |
| bialix | so my project.cfg in some sense used my knowledge about CVS modules. May be this knowledge prevent my understanding of some nested ideas | 19:22 |
| bialix | in the end I'm just reinventing the wheel | 19:23 |
| KintaroHoe | Hi everyone | 19:23 |
| KintaroHoe | I've a question I need to install a bzr server in the office I work for | 19:24 |
| bialix | hi | 19:24 |
| KintaroHoe | They use windows and I'm unable to find a documentation that explain how to do all of this :/ | 19:24 |
| bialix | I'm windows guy | 19:24 |
| KintaroHoe | I'm trying to play with bzr init-repo... but unable to do checkouts | 19:24 |
| bialix | what's the problem actually? | 19:24 |
| KintaroHoe | bialix: Well I want to install a server to host the office projects and I don't know how to do this :/ | 19:25 |
| bialix | you need local only server? | 19:25 |
| KintaroHoe | yes | 19:25 |
| KintaroHoe | a LAN server | 19:25 |
| bialix | it will not be visible outside the local network? | 19:25 |
| KintaroHoe | bialix: indeed | 19:26 |
| bialix | so you need to install bzr as usual from any of official installer | 19:26 |
| MattCampbell | I want to use bzr and bzr-svn to manage my modifications to an open-source package that uses SVN for its version control, with the intention of contributing at least some of these changes back upstream. Is there a recommended workflow for doing this? | 19:26 |
| KintaroHoe | bialix: yes I have it | 19:26 |
| bialix | then select where you want to keep your branches | 19:27 |
| KintaroHoe | bialix: okay and then ? | 19:27 |
| bialix | then you need just adding to auto-start section the command: bzr serve --allow-writes | 19:28 |
| bialix | and specify working directory for this command to the location where you want to keep your branches | 19:28 |
| bialix | that's basically all | 19:28 |
| KintaroHoe | bialix: what auto-start sectiopn ? | 19:28 |
| bialix | Start -> Programs -> Auto-... | 19:29 |
| KintaroHoe | ah yeah ok | 19:29 |
| KintaroHoe | bialix: but now how ti initialize branches in server side ? | 19:29 |
| bialix | sorry, I'm using Russian Windows, I don't remember how it named in English | 19:29 |
| KintaroHoe | because I do: mkdir dir and then bzr init dir | 19:30 |
| KintaroHoe | but when I checkout it says not a branch | 19:30 |
| bialix | you need to work with your server with bzr:// url | 19:30 |
| KintaroHoe | I don't understand this | 19:30 |
| MattCampbell | bialix: I think you mean Start -> Programs -> Startup | 19:30 |
| KintaroHoe | yes | 19:30 |
| KintaroHoe | I get it for the autostart | 19:30 |
| bialix | yes, I think it is | 19:30 |
| KintaroHoe | but now I don't know how to create my projects and project branches in server side | 19:30 |
| bialix | let's say your server has name SERVER or IP: 192.168.1.1 | 19:31 |
| MattCampbell | KintaroHoe: Since I came in late to this conversation, can you explain what you're trying to do? | 19:31 |
| KintaroHoe | ok | 19:31 |
| KintaroHoe | MattCampbell: all I want is hosting projects in bazaar for the office I work for | 19:31 |
| bialix | you can execute from any other machine (or locally): bzr init bzr://SERVER/branch-name | 19:31 |
| KintaroHoe | they uses windows | 19:31 |
| KintaroHoe | bialix: ah ok | 19:32 |
| bialix | everything as local work, but you should use bzr:// urls | 19:32 |
| KintaroHoe | bialix: ok | 19:32 |
| MattCampbell | KintaroHoe: It would probably be easier if you used Linux on the server. | 19:32 |
| MattCampbell | Then you can just use sftp or bzr+ssh with regular Unix accounts. | 19:33 |
| CaMason | hi guys.. for some reason, a load of bzr_log.random files have started appearing in my working copy | 19:33 |
| bialix | heh | 19:33 |
| bialix | KintaroHoe: one note about startup | 19:33 |
| KintaroHoe | MattCampbell: I can't my boss doesn't want a linux that(s the issue | 19:33 |
| bialix | windows works just fine! | 19:34 |
| KintaroHoe | windows sux but I'm forced to use it | 19:34 |
| * bialix shuts up | 19:34 | |
| MattCampbell | I'm not bashing Windows in general; it's a fine desktop OS. | 19:34 |
| MattCampbell | KintaroHoe: What version of Windows is the server running? | 19:35 |
| * LarstiQ looks up | 19:35 | |
| KintaroHoe | MattCampbell: XP | 19:35 |
| KintaroHoe | MattCampbell: is there a document that explains how to set up a bazaar server for projects ? | 19:35 |
| MattCampbell | I'm looking; I don't need it myself, but now I'm curious. | 19:36 |
| LarstiQ | KintaroHoe: what bialix said I'd say | 19:36 |
| LarstiQ | KintaroHoe: you mention you can't checkout, could you please give more context (pastebin full command plus output)? | 19:36 |
| LarstiQ | KintaroHoe: with the information at hand it is hard to tell what is going on. | 19:37 |
| MattCampbell | The only problem with putting the server in the Startup group is that then the server will only be available while someone is logged into the Windows box. | 19:37 |
| bialix | MattCampbell: I'm running it as servicwe | 19:37 |
| bialix | service | 19:37 |
| MattCampbell | bialix: How do you do that? Do you use servany or something similar, or is there a special bzr executable for that purpose? | 19:38 |
| bialix | so it works just fine | 19:38 |
| bialix | srvany | 19:38 |
| MattCampbell | Oops, I did misspell that. | 19:38 |
| bialix | here instructions: http://groups.google.com/group/ru_bzr/web/bzr-serve---windows-2k-xp | 19:38 |
| bialix | they're in Russina | 19:38 |
| bialix | Russian | 19:38 |
| bialix | use babelfish or google translate service | 19:39 |
| MattCampbell | I've used srvany before. What user should the service run as? (e.g. System, LocalService, NetworkService) | 19:39 |
| LarstiQ | MattCampbell: you don't perchance have commit access to the upstream svn? | 19:40 |
| bialix | I don't remember. My server at work, and now I'm home | 19:40 |
| MattCampbell | LarstiQ: No; that's why I want to use bzr and bzr-svn, because SVN vendor branches seem like an ugly hack. | 19:40 |
| MattCampbell | So I would be sending patches of some kind back upstream. | 19:41 |
| LarstiQ | MattCampbell: right | 19:41 |
| LarstiQ | MattCampbell: so then the most important part is probably how upstream likes to work | 19:41 |
| LarstiQ | MattCampbell: I didn't test against svn, but you could use `bzr send` | 19:42 |
| MattCampbell | bialix: Your Windows bzr server requires authentication and is used by multiple developers, right? I wonder how you manage user accounts for the bzr server in that setup. | 19:43 |
| LarstiQ | MattCampbell: large chance that's not exactly what upstream wants though | 19:43 |
| bialix | no | 19:43 |
| bialix | builtin bzr server does not provide ACL support | 19:44 |
| bialix | we have very small dev group | 19:44 |
| bialix | so I should not be paranoid about other people | 19:44 |
| bialix | and I always has backups if something will going wrong | 19:45 |
| MattCampbell | LarstiQ: I suppose most projects want plain diffs, often attached to bug tracker entries, from non-committers. | 19:45 |
| bialix | though I'd like to have some sort of ACL there | 19:46 |
| LarstiQ | MattCampbell: that, or mailing lists, yes. | 19:46 |
| LarstiQ | MattCampbell: but do they want one big rollup patch? Or one patch per bzr commit? Or rebased into logical units? | 19:46 |
| LarstiQ | MattCampbell: bzr-rebase might also be of use to you | 19:47 |
| MattCampbell | FWIW, the specific project is TightVNC. I haven't even started making my changes yet, but I want to make sure my workflow is right from the start. | 19:49 |
| MattCampbell | I haven't even had any contact with that project yet; I'm just starting out. | 19:50 |
| MattCampbell | So I guess I start with "bzr branch http://vnc-tight.svn.sourceforge.net/svnroot/vnc-tight/trunk/ tightvnc", then make my changes, committing to my local branch after each change is done. | 19:50 |
| === thunderstruck is now known as gnomefreak | ||
| MattCampbell | Then I can think about how to give them back. | 19:50 |
| * LarstiQ nods at MattCampbell | 19:51 | |
| MattCampbell | Is bzr-svn meant to use this way, i.e. to contribute back to a project that uses an SVN repository in which you're not a committer? | 19:52 |
| LarstiQ | MattCampbell: I don't think it's the original use-case, but it's certainly valid. | 19:53 |
| bialix | KintaroHoe: I think you should start using bzr without any server. Any shared folder on your server is fine | 19:53 |
| MattCampbell | So the original use case is a project that wants to migrate from svn to bzr? | 19:53 |
| bialix | he's left. | 19:54 |
| MattCampbell | I suppose Windows file sharing is the most natural solution in a Windows-only office where everyone is on the same LAN. | 19:54 |
| bialix | me too | 19:55 |
| MattCampbell | I was going to suggest using an SSH or SFTP server, such as VShell (commercial) or Cygwin sshd. | 19:55 |
| === dereine is now known as dereine[OFF] | ||
| MattCampbell | LarstiQ: Thanks for at least re-assuring me that I was on the right track. My biggest fear when using version control is always that I'll start out doing things the wrong way. | 19:56 |
| LarstiQ | MattCampbell: I'd guess the original use case is using bzr to commit to an svn repo where others still use svn. | 19:57 |
| * svn-up just realized he might get kicked because of his nickname | 19:58 | |
| LarstiQ | svn-up: nah, that won't happen | 19:59 |
| MattCampbell | I didn't think this crowd was that antagonistic toward svn. | 20:03 |
| LarstiQ | we're not. | 20:03 |
| LarstiQ | I might at times lament some of it's shortcomings that make my life difficult, but that's all :) | 20:03 |
| * bialix waves bye | 20:06 | |
| MattCampbell | Now I just have to learn how to set up bzr-svn under Windows. I'd prefer to just use my Ubuntu VM (yes, Windows is the host), but I'm going to be working on a Windows program. | 20:08 |
| LarstiQ | MattCampbell: bzr-svn is included with the windows installer | 20:09 |
| LarstiQ | at least the standalone .exe one | 20:09 |
| MattCampbell | LarstiQ: Cool, thanks. | 20:10 |
| MattCampbell | downloading version 1.11-1 of that now. | 20:10 |
| MattCampbell | I'm curious about the state of IDE integration for Bazaar. In other words, is Bazaar yet as "code monkey" friendly as Subversion? | 20:14 |
| LarstiQ | MattCampbell: I'll wager a 'no' to that. | 20:15 |
| LarstiQ | MattCampbell: I believe the Eclipse support is most advanced. | 20:15 |
| LarstiQ | MattCampbell: http://bazaar-vcs.org/IDEIntegration | 20:16 |
| visik7 | nothing about Xcode :( | 20:17 |
| LarstiQ | http://bazaar-vcs.org/Integrating_with_Bazaar for those willing to work on support for their favorite environment :) | 20:18 |
| * LarstiQ is a vim user himself | 20:19 | |
| MattCampbell | Mind you, I don't use an IDE, even on Windows; currently I use vim plus command-line tools. But I might soon be working with people who are used to an IDE. | 20:19 |
| LarstiQ | although I've had to start using netbeans since last week | 20:20 |
| LarstiQ | MattCampbell: right, which one? | 20:20 |
| LarstiQ | MattCampbell: there is Tortoise, which builds on Qbzr | 20:20 |
| MattCampbell | Probably Visual Studio. | 20:20 |
| MattCampbell | Then again, a lot of the software I've written for my employer (I'm currently the lone programmer) is in dynamic languages such as Python, Lua, and PHP. | 20:22 |
| MattCampbell | So I don't really know what IDE would be a good fit. | 20:22 |
| MattCampbell | but that's off-topic here. | 20:22 |
| MattCampbell | Hmm, I was thinking ActiveState Komodo would be a good choice; now I see it has built-in Bazaar support | 20:28 |
| LarstiQ | does it? cool :) | 20:30 |
| MattCampbell | Well, at least the IDEIntegration page says so. | 20:31 |
| LarstiQ | It's in the 5.0 release notes too | 20:31 |
| MattCampbell | To my shame, my company is just starting to use version control. Our new project manager wants to use SVN, and I've been debating whether to persuade him (and the CEO) of Bazaar's benefits or just use SVN. | 20:33 |
| MattCampbell | I think we should at least use bzr to manage modifications to open-source packages that we use. | 20:33 |
| LarstiQ | MattCampbell: you said you were the lone coder, does that hold true for this situation? | 20:35 |
| MattCampbell | I won't be the lone coder much longer. | 20:35 |
| MattCampbell | (So I have a lot of work to do to transition from lone coder to team.) | 20:36 |
| MattCampbell | But I may very well be the only one making modifications to upstream open-source projects, at least for a while. | 20:37 |
| LarstiQ | MattCampbell: ah ok | 20:37 |
| === dereine[OFF] is now known as dereine | ||
| MattCampbell | I gather that the bzr Windows installer doesn't include bzr-rebase. | 21:13 |
| LarstiQ | MattCampbell: probably not | 21:21 |
| CaMason__ | Guys, any idea what these log files are? bzr_log.number~ | 22:42 |
| mrooney | Is there any easy way to delete a branch on LP, I typo'd in my push | 23:25 |
| mrooney | or is that a #launchpad question? | 23:25 |
| jelmer | I think there is a bin icon you can click | 23:26 |
| jelmer | but in general this sort of question is more appropriate for #launchpad | 23:26 |
| mrooney | jelmer: okay, thanks :) | 23:28 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!