#bzr 2007-09-01 <cgdae> hello. apologies if this is already known, but i think that there are some broken links on http://bazaar-vcs.org/BzrUserGuide <abentley> cgdae: We just switch the extensions from .htm to .html <abentley> Feel free to update that page. <cgdae> ah, ok. i'll have a go. <NfNitLoop> Hmm. SO I've just been reading up on mercurial. I see a couple advantages bzr has: sane shared repositories (instead of hg's hard linking) and easier command-line interface. <NfNitLoop> what else am I missing? <NfNitLoop> The only real advantage I see to hg so far is that it scales better. <cgdae> i've fixed the broken links on http://bazaar-vcs.org/BzrUserGuide. <james_w> cgdae: thanks. <james_w> NfNitLoop: a lot of people like mq. <james_w> NfNitLoop: they also have the hg book. <cgdae> all i need now is some unbiased advice about whether to try mecurial or bazaar as a replacement for cvs... :-) <james_w> cgdae: try either. <james_w> cgdae: what are your requirements? <NfNitLoop> james_w: mq? <cgdae> james_w> we have a developer who has only occasional internet access. we've been packaging up our entire cvs repository for him to download and use locally, then he emails patches to us which we commit. repository is fairly small, 18MB compressed i think. <cgdae> james_w> so no special requirements really. we use openbsd as server. it doesn't have a bazaar port, but it installs trivially by hand. <Peng> NfNitLoop: Hg has file copies. <Peng> s/has/supports/ <james_w> NfNitLoop: mercurial queues, quilt for hg basically <james_w> cgdae: your project is not too large, so either system should cope fine. <NfNitLoop> I'm not familiar with quilt. <james_w> I would guess that bzr is easier to install, but that's just a guess, I may be wrong. hg requires C code I believe, for bzr it is optional. <NfNitLoop> hg ended up being easier for me to install, since they provide a package for Debian stable. <Peng> The C code in hg isn't a major issue for installation, unless you're on an odd platform that it doesn't work on. <NfNitLoop> (though IIRC the latest version was released last june) <james_w> cgdae: I would suggest that you install both and just play aroung see which you prefer. <james_w> also chat to the hg folks as well, and see how helpful they seem, you may need some help in the future with something. <james_w> Peng: thanks for the clarification. <james_w> NfNitLoop: quilt is for managing multiple patches, it's kind of version control, but a bit specialised. <james_w> one thing that is odd to me is hg's merging, there's an extra step in there which I find a bit weird. <cgdae> james_w> that's good advice. thanks. <NfNitLoop> james_w: well, it seems to be a different approach. <NfNitLoop> iirc, bzr requires that you commit local changes before merging. <NfNitLoop> hg doesn't. So it gives you a chance to do so before you actually merge pulled changesets into the working copy. <james_w> ah, that's why, thanks. <NfNitLoop> personally, I think committing your changes separately is a better idea. <NfNitLoop> But there's something to be said for not requiring that workflow. <NfNitLoop> on the other hand, because of the way hg does it, you can have several heads in a single branch. Which ... seems needlessly complex. <james_w> that will throw a lot of people I guess. <james_w> you can go all the way to git and just do that all the time. It does win you quite a lot, but some people will take a long way to get their heads around it. <NfNitLoop> git allows multiple heads in one branch? <NfNitLoop> (or repo, or whatever they call it?) <james_w> yeah, in a repo, but a repo is all you have in git, so it's like a bzr branch. <james_w> ...sort of. <NfNitLoop> I really like the separation of working copy / branch / repository with bzr. I haven't seen that with other VCSes. <james_w> The branch/repository distinction confuses some, and the terminology confuses others. <NfNitLoop> It confused heatherjohnson@example.com. <NfNitLoop> I came from cvs/svn. <james_w> Also, as a repo is not needed people may not create one when they start, and then they lose a lot if they are branching locally. However most tutorials now start with the 'init-repo' step to avoid this. <NfNitLoop> where a branch was very much something *inside* the repository, not able to be separated. <james_w> but that then means you have to get straight in to explaining the differences, before they've even started. <NfNitLoop> Yeah. Which may not be a good first impression. "Wow, this is complex." <james_w> yeah, you can't separate them in bzr either, but you get a hidden repo if you don't have an explicit one. <NfNitLoop> I don't know that it's that important, though. It's always easy to convert to a shared repo later. <james_w> exactly. <james_w> yeah, it is. People have talked about adding a command to do that in one step, but I've not seen any code. <NfNitLoop> Eh. you don't need another command for that when it's a few simple commands that are easy to remember and not too often used. <james_w> true. <NfNitLoop> er, rather, the simple commands are used often. the single comprehensive command would be rarely used. You knew what I meant. :p <sblack> Anybody have any word on .90 windows standalone installer? <sblack> I was going to try out .90 but have trouble building with Visual Studio 2005 installed <ekim|irc> How can I setup bzr to work like subverion (to a point) <ekim|irc> I wanna use bzr to upload my gfiles to a remote server <ekim|irc> how can I do that <jkakar> ekim|irc: You can, yes. <ekim|irc> how ? <jkakar> ekim|irc: See 'bzr help checkout' for more information. <jkakar> ekim|irc: Basically, if you have a branch on a remote system and you want to work in the Subversion style where your local changes have to commit remotely you can 'bzr checkout sftp://my-remote-branch'; commits made in the resulting local branch will need to succeed on the remote branch for the commit to complete. <ekim|irc> someone told me that you can actually use mod_dav_svn to do it <sblack> Does anyone here have any knowledge of a windows binary distro of 0.90? <sblack> I've tried working with the source, but I get build complaints about Visual Studio 2003 (I have 2005) and the instructions <sblack> for "-c mingw32" don't appear to be recognized <Peng> Oooh. Lightweight checkouts need to contact the server for just 'bzr st' or 'bzr diff'. That sucks. * Peng wanders off. <Peng> Hm. bzr co --lightweight grabs .bzr/repository/format four times. * Peng wanders off. <encompass> ok, I have a need! <encompass> I deleted a dirctory and I want to get the latest revision back... how do I do that? <encompass> my project is here... htp://launchpad.net/memaker <encompass> is it simply bzr pull? <luks> deleted as in 'rm DIR' or 'bzr rm DIR && bzr ci'? <fullermd> Deleted as in your deleted your copy of the branch? <encompass> yeah <encompass> I am the only dev right now... and when I commit and push it goes to trunk <encompass> as in rm DIR <encompass> well... rm -rf DIR <encompass> it is my most recent revision that is needed <fullermd> DIR being a dir _in_ your branch? <mwhudson> revert should bring it back <encompass> what is revert? <encompass> bzr revert? <fullermd> Yeah, `bzr revert $DIR` <encompass> let's see <encompass> thinks... works great now... saved the day again! * encompass hugs ubuntulog <encompass> :P <CardinalFang> Grr, there's no installer for Fink on OS X? <sabdfl> hey revisionistas, has any of the HPSS code landed since 0.17? <james_w> sabdfl: I believe some smaller things have gone in to make the merge easier later, but the main changes are still out. <sabdfl> okidoki <sabdfl> thanks james_w <james_w> I know Martin was trying to get it in to 0.91, but I don't think it's up for review yet and the freeze doth approach. * sabdfl can't wait for that stuff to land in the code host <mrtuple> would someone mind lending a hand with baz-import ? <james_w> mrtuple: what are you stuck with? I'm not sure I can help, but I don't think Aaron is around at the moment. <mrtuple> oh thanks. <mrtuple> I have a tla archive ... <mrtuple> that 'tla archives' reports as heatherjohnson@example.com <mrtuple> /home/{karchives}/mcp-2005 <mrtuple> heatherjohnson@example.com <mrtuple> /home/{karchives}/vb-2005 <mrtuple> I'd like to convert the whole thing to a bzr repo. <mrtuple> (The first one by the way, mcp-2005) <mrtuple> So I go to the path I want the repo to reside at, and try this: <mrtuple> bzr baz-import mcp-2007 heatherjohnson@example.com <mrtuple> Which I *think* is what http://bazaar-vcs.org/BzrTools says to do. Of course, I must be thinking wrong, because it doesn't work. <mrtuple> bzr creates a mcp-2007 repo (at least it has a .bzr file in it), but after that it crashes with a long backtrace. <mrtuple> The traceback claims OSerror 2 (No such file or dir), but I don't see a line clarifying which argument doesn't exist... <mrtuple> I can post copies if it helps. <james_w> yes please. <mrtuple> couple minutes probably... <james_w> fine. <james_w> are you running a recent bzrtools? <mrtuple> http://rafb.net/p/vJ5ud964.html <mrtuple> My bzr version is 0.90, how do I determine my bzrtools version? <mrtuple> (okay, more than a couple of minutes...) <james_w> bzrtools complains if it is out of date, so you should be fine. <james_w> are you on Debian/Ubuntu? <mrtuple> Yes, lenny/sid <james_w> then you're fine. <mrtuple> goody. <james_w> so it looks like it is having trouble exec'ing baz, you do have it installed, it's on your path etc? <mrtuple> type -p bzr reports '/usr/bin/bzr' <james_w> no, baz not bzr <mrtuple> damn spelling :^) <mrtuple> well, I'll be darned. its not. <mrtuple> I thought bzr replaced baz... <mrtuple> I still need baz for importing? <james_w> yeah, it exec's baz to get the information and then imports it to bzr. <james_w> they are completely different systems really, the naming is just historical. <mrtuple> apt-get'ing baz now... <mrtuple> I interpretted the log line... <mrtuple> bzr: ERROR: pybaz.errors.ExecProblem: baz exited with code 3 (expected exit code 0) <mrtuple> and <mrtuple> ExecProblem: baz exited with code 3 (expected exit code 0) <mrtuple> As 'baz' being a helper app that came along with bzr... Never thought to consider that it was missing. <mrtuple> OK, the traceback is at least shorter now... <mrtuple> http://rafb.net/p/uJmgzU38.html <mrtuple> Looks like baz is being called with an unexpected option. Perhaps this is a real defect... <lifeless> what version of baz and pybaz do you have? <mrtuple> I think I just figured this out. <mrtuple> The trace shows a pybaz from *my own* python testing tree being used. Not the pybaz from debian package systesms. I had installed this version *several* months ago when I was looking at the conversion process. <mrtuple> I'm removing that one, installing the pybaz debian package, and then the import will probably work. <mrtuple> I'll keep you posted, sorry for the trouble. <james_w> no problem, well spotted. <mrtuple> Oh yes. It's working now --- complete with progress bar... <mrtuple> whooho! <mrtuple> Finally I'll have a superior VCS! (all the more branches to hang myself on :^) #bzr 2007-09-02 <Verterok> Hi y'all <Verterok> beuno: ping <beuno> Verterok, pong <Verterok> beuno: Hi! <beuno> hey Verterok, how are you doing? <Verterok> working a bit in bzr-eclipse & bzr-xmloutput :D , how are you? <beuno> Verterok, working on my php<>bzr integration :D <beuno> what are you working on with bzrxml? <Verterok> I made some changes that modify a bit (actually extend) the generated xml :P <Verterok> these are related to merges and affected files (bzr log -v) <beuno> Verterok, interesting, I'm basing the php integration on your plugin, dos it change the format of the zml at all? <beuno> *xml <Verterok> I can pastebin a generated xml, but the change is how the revisions are handled <Verterok> the current trunk handle all revisions as equals (i.e: don't know about merges) <beuno> Verterok, would you? that way I can start crying on all the changes I have to make :p <Verterok> sure <beuno> although it's great you're extending it, if you need a hand, I get along much better with python then with java :D <Verterok> maybe this is not too big, basically I added two new tags: <merge> and <affected-files> <Verterok> both are child elements of <log> <beuno> Verterok, aren't the affected files already shown? <Verterok> I don't remember :P <beuno> hahaha <beuno> ok ok, well, you already show the deleted/new/modified <beuno> as a child of <log> <Verterok> in my branch I added a <affected-files> tag, to group them <beuno> ah, well, that will probably just me my code cleaner <beuno> that's the only bit that's a bit... les the ideal :D <beuno> what will the merge tag show? <Verterok> I think that the *other* change 'll take a bit more of work (sorry for that) <Verterok> take a look: http://rafb.net/p/thAACb16.html <beuno> Verterok, I welcome any improvements, I really do :D <Verterok> great to known, but the <merge> is a big change :P <Verterok> it group the merge revisions logs <beuno> aaaaaaah <beuno> Verterok,I understand :D <beuno> I was actually doing that manully in the PHP code <Verterok> ah, great then! I think your code could be clean up a bit :D <beuno> I'll probably shave off half the lines of code! yay! :D <Verterok> so, I have your OK to push to trunk? ;) <beuno> as I imported I chedked if it was a subrevision, and if it was, associated it <beuno> Verterok, I'm pretty sure you don't need my OK, but I welcome it <Verterok> I started to work in the same processing (at the java side), but then I changed bzr-xmloutput :D <beuno> heh, yes, it makes much more sense <beuno> I wasn't as confident to go in and change someone's else code <Verterok> you are most than welcome to do it :D <beuno> I have been playing around with bzr code more lately, even got a few patches in :D <beuno> Verterok, cool, thanks, I'll look into what I'm missing/doing on my side that I can do directly in the plugin, branch, and ping you :D <Verterok> great! congrats! <Verterok> sure! <beuno> I tuhnk I'll be able to release some of my php code in the following weeks, quite a few people have been requesting it, so it doesn't make sense to keep on develpoing behind closed doors <Verterok> beuno: I just pushed those changes. now at revno: 18 <beuno> (I'm typing horribly today) <beuno> great, LP just emailed me too :p <Verterok> no problem, I type horribly every day :P <beuno> hahhah <beuno> do you have any other changes in mind? <Verterok> no to the log command, but i need to take a look to annotate <Verterok> I have some plans to implement a few more commands <beuno> Verterok, if you want to point me at something specific to look into/code, just drop me a line and I'll see what I can do :D <Verterok> for the moment I have in mind: 'bzr plugins' and 'bzr info' (maybe I'll do a custom info --xml command with more information), both to aid bzr-eclipse <beuno> Verterok, ah, that sounds intersting, and bzr status maybe? or is that implemented already? <Verterok> it's already there :D <beuno> how efficient of you :p I'm going to need that in the near future <Verterok> drop me a line if you need something for: status --xml <beuno> Verterok, will do, thanks! <beuno> Verterok, what do you think on having a wiki page with ToDo's? that way it might be easier to know what needs to be done * beuno just thought of bzr missing being useful too <Verterok> sounds great! maybe in the bazaar wiki? <beuno> Verterok, yeap, seems like the right place <Verterok> I never used yet :P <beuno> heh, I'll create the page real quick, we can both subscribe and spy on what the other one is thinking of :p <Verterok> that 'ld be interesting <beuno> Verterok, http://bazaar-vcs.org/bzr-xmloutput <beuno> I;ve subscribed <Verterok> that was fast! <beuno> and now, I have to leave for a few hours, but we'll be in touch :D * beuno waves at vert <Verterok> seeya <nvictor> hi guys :) <nvictor> I just downloaded the windows version of bazaar <nvictor> can you tell me how it works? <nvictor> I'm new to version control :) <NamNguyen> hi <NamNguyen> in what encoding is NEWS? <NamNguyen> it shows Lukas Lalinsky as garbage <fullermd> Looks normal to me, and I'm in UTF-8... <tonyyarusso> Aren't those things usually gzipped ascii? <matkor> Hi ! How can make bzr setup.py install man files in /usr/share/man (FHS) instead of /usr/man/ ? <lifeless> not sure <lifeless> possibly some setup.py install --help info will help <matkor> mmm I am gonna check --install-data /usr/share ... <AfC> matkor: we did a mv ${D}/usr/man ${D}/usr/share/man in the post_inst part of the Gentoo package <lifeless> I don't suppose you filed a bug ? ;) <AfC> Against who? <matkor> AfC: I see similar patch for PLD ;) <AfC> [I mean, sure, _maybe_ FHS would be a strong enough argument to get Python to change ... but at the cost of breaking every single Python derived package out there? I doubt they'd do it, frankly] <james_w> there should be an option to set the mandir though shouldn't there? <matkor> james_w, Afc : --install-data /usr/share seems to work <AfC> matkor: neat <james_w> thanks mak <james_w> matkor sorry. <lifeless> AfC: against bzr <lifeless> AfC: its our problem to make our setup.py do the right thing <lifeless> or to document how to do it <AfC> lifeless: ok <AfC> matkor: do you want to file it, or shall I? <hsn_> what i need for syntax highlighting in olive? <dato> in debian and ubuntu, python-gnome2-desktop <dato> the library is called gtksourceview <dato> hsn_: assuming you mean highlighting of the diffs <dato> I have no idea if other highlighting is supported <hsn_> i get olive errors like: ImportError: No module named dialog or bzrlib.errors.BzrError: must supply file_id or path <duckx> quicksilver: jelmer = jw ? <duckx> plop <duckx> Sorry <duckx> james_w: around ? <james_w> duckx: hi <duckx> duckx = Frederic Brin ;) <duckx> You are the guy behind bzr-builddeb right ? <james_w> ah, hi. Thanks for your fixes/ <duckx> No problem, I enjoy tweeking python <james_w> :) <duckx> Well, I tried the import-dsc command <duckx> And I was wondering one thing <duckx> Well, it is may be the normal behaviour <duckx> When you import a dsc, the orig.tar.gz is commited <duckx> But the debian dir is not .... <duckx> Is that the normal way to go ? * duckx thinks it is not ;) <duckx> By the way I was wondering one thing ... <duckx> What is the easiest way to get python have my bzr co of bzr-buildep be the python module loaded ? <duckx> Well, currently I hack the installed debian package, and port the tweeks back to my co tree <duckx> -> that sucks <james_w> mkdir -p ~/.bazaar/plugins/; ln -s /path/to/co ~/.bazaar/plugins/builddeb <duckx> k <duckx> Just fine for me ;) <james_w> as for the import let me investigate. <james_w> you're not using --snapshot correct? just import-dsc blah_0.1-1.dsc? <duckx> yes indeed <duckx> with the --to flag <duckx> bzr import-dsc --to gnucash gnucash*.dsc <james_w> I need to pull your fix first. Shows that I need some blackbox tests :) <duckx> ;) <james_w> I've just imported one dsc and there are no uncommitted changes. <duckx> Hmm, damn <duckx> What did I do yesterday <duckx> Works fine for me :( <duckx> Ok lets try the merge upstream thing <james_w> ah, merge upstream doesn't commit I think. <duckx> Yeah, indead, that is the normal workflow <duckx> But I had a wired thing after doing the following workflow: <duckx> import-dsc <duckx> Then merge-upstream <duckx> bzr status gives me the following <duckx> http://www.pastey.net/73292 <james_w> that looks right for the aim of the command. <james_w> are you confused that it added all of debian/ again? <duckx> Yes ; <james_w> ok, so I had the same opinion as you at first, but other convinced me to do it this way. <duckx> Well, what I don't get <duckx> Is that I imported gnucash-2.2.1 over a 2.0.5 <duckx> I should see a bunch of file modified <duckx> nont only 2 <james_w> let me draw it for you. <duckx> Yeah thx <james_w> actually drawing it isn't very useful. <james_w> what it does is really play with two branches in one, but you never see the second. Let's make the second explicit and then it might be clear. <duckx> My current issue is to get where the debian patch is located ... , <james_w> you have an upstream branch and a debian branch. <duckx> k <james_w> the upstream branch clearly just has upstream imports on it 0.1...0.2 etc. <duckx> Yeah That is what I see with bzr log <duckx> ------------------------------------------------------------ <duckx> revno: 2 <duckx> tags: upstream-2.2.1 <duckx> committer: Frederic Brin <heatherjohnson@example.com> <duckx> branch nick: gnucash <duckx> timestamp: Sun 2007-09-02 13:00:17 +0200 <duckx> message: <duckx> import upstream from gnucash_2.2.1.orig.tar.gz <duckx> ------------------------------------------------------------ <duckx> revno: 1 <duckx> tags: upstream-2.0.5 <duckx> committer: Frederic Brin <heatherjohnson@example.com> <duckx> branch nick: gnucash <duckx> timestamp: Sun 2007-09-02 12:57:51 +0200 <duckx> message: <duckx> import upstream from gnucash_2.0.5.orig.tar.gz <james_w> so your diff between the 2.0.5 and 2.2.1 lies on this branch. <james_w> yeah, so you can see the upstream changes with bzr diff -r1..2 <duckx> I get this <james_w> now your debian changes are based on the upstream code, so that is a separate branch that was "created" with a bzr branch -r 1 upstream debian/ <james_w> and when you import a new upstream you need to merge the changes together. <james_w> the question is which way you perform this merge. <james_w> the way you are expecting I guess is that you do 'cd debian/; bzr merge ../upstream/' <james_w> and then you would see a pending merge of 'upstream 2.2.1', with all of upstream's changes, and whatever changes are made to the packaging. <james_w> however the plugin does it the other way, so you are currently sat on the 'upstream' branch with the 'debian' changes merged in. * duckx is trying to understand the workflow ... <james_w> there is no real difference, you can see upstream changes by following one 'branch' and 'debian' changes by following the others. <james_w> you can also get the differences by diffing them. <james_w> if you fire up bzr viz (if you have it), you will see that all of the parent references are 'correct'. <duckx> Ok, let me investigate <james_w> the difficulty comes with bzr's distinction that the left parent is special, in this case that is the upstream branch. <james_w> so bzr log etc. emphasise that, showing the mainline as upstream's code, with all of your debian/ changes merged in to the last commit. <james_w> but as I say, topographically all is correct, and you have the desired parent links. <james_w> The left parent distinction is exactly why I was going with 'merge upstream in to heatherjohnson@example.com. <james_w> However siretart convinced me otherwise. <james_w> one moment... <duckx> k * duckx is going to install viz <james_w> it's useful to have, as it makes the topography clearer than log. <james_w> and gannotate is far more useful than plain annotate. <james_w> let me know when you're up to speed and I'll explain the rationale. <duckx> Well, I got viz installed <duckx> I see the same stuff that what I see in the log <duckx> Ok let's draw a simple example <james_w> if you click on the commits on the debian branch you should see two parents for each new debian version. <james_w> they aren't drawn on the graph, but they are shown in the info area. <duckx> Well, I don't get where the debian revision is ... <duckx> I muss have miss one stuff <james_w> have you committed? <duckx> Nop <james_w> I don't think viz shows pending merge revisions. <duckx> Ah <james_w> you can always uncommit after if you like. <duckx> But it should have been commited for the first dsc-import ? <fullermd> Pending merges are figments of the working tree's imagination ;) <james_w> yeah, it was, but the merge makes it a pending merge again. <james_w> you are on the 'upstream' branch, which knows nothing about the debian revisions. <duckx> Ah <duckx> That is <duckx> The reason <duckx> Ok let me do a commit <duckx> Ok commited <duckx> bzr viz is a lot clearer right now <james_w> yep <duckx> james_w: well I need to read about dir-state tree first <duckx> I think it will make the things clearer for me <duckx> james_w: anyhow, thx for your time, and explaination <james_w> duckx: no problem. Give us a shout if you want anything else explaining. <james_w> and thanks for your fixes. <dennda> hey there <dennda> http://pastebin.ca/678878 <-- Nice little bug I get. (Pull didn't work, so i was told to merge. That didn't work either, so i tried to push. That's the result.) <fullermd> Well, the immediate error is that push is a writing op, and you can't write over http. <fullermd> But push isn't going to solve a problem you're having with pull/merge. <dennda> The last line indicated it was a bug <dennda> That's why I ask <fullermd> Well, in the sense that we should say "Hey, you can't do that" instead of spitting out 30 lines of traceback, it is... <dennda> You want the whole thing, i guess? <fullermd> Well, that part isn't really a bug or anything broken; it's expected behavior, for what you tried. <dennda> What should I try instead? <fullermd> Well, that would require going into the actual problem you're trying to solve :) <fullermd> It's easy enough to adjust that push so it [probably] works, but if you're starting out trying to pull/merge something, pushing probably isn't what you want to do anyway. <dennda> Ah that just was the wrong adress to push to <fullermd> Yah. To push you'd use a sftp://-ish (or bzr+ssh://-ish) URL. <fullermd> But what's the problem you have with merge? <dennda> Yes, i tried that now. It gave me "No new revisions to push.". <dennda> The actual problem is, that pull doesn't work as I would expect it: bzr: ERROR: These branches have diverged. Use the merge command to reconcile them. <dennda> So I try merge: bzr: ERROR: Working tree has uncommitted changes. <fullermd> Ok, let's look at 'em one at a time. First, the pull. Do you expect the branches to have not diverged? <fullermd> (usually, that would mean that you've made commits to your branch that aren't in the upstream) <dennda> After I changed the file of my branch the last time, I immediately pushed it. (And that worked) <fullermd> You can try using 'bzr missing' to figure out what revs differ between the branches; that should point you in the right direction. <dennda> http://pastebin.ca/678893 <fullermd> As for the merge issue, it's just what it says; merge by default will refuse to run if you've got uncommitted changes lying around. <fullermd> OK, so you made your branch at revno 13. Since that time, you've made two commits in your local branch (your 14 and 15), and Jason has made two in the upstream branch (his 14 and 15). <dennda> I would expect pull to grab the below mentioned two missing revisions. <fullermd> Pull would do that if you were still at rev 13. But you have local changes. <fullermd> Pull only moves you "forward", in a sense. And since his branch isn't "forward" of your branch (it doesn't include your current head rev), it can't do anything. <fullermd> So, what you need is 'merge', to merge in his revs and create a new revision with joins his changes with your local changes. <dennda> What would be the command to do that? <fullermd> That's failing for you for the reason above; you've got other changes your haven't committed yet. So, either commit them (if you want 'em), or revert them (if you don't), then merge should do its work. <fullermd> (You _can_ force merge to work over uncommitted changes, but it's almost always a bad idea, because it muddles up your history.) <dennda> Is it possible to ask bzr what exact changes those are? I can't remember havn't changed anything that I didn't push. <fullermd> Mmm. Two different questions. <fullermd> But this isn't stuff you haven't pushed; it's stuff you've changed but not _committed_. So, 'bzr stat' or 'bzr diff' will tell you what's sitting around. <dennda> I just want to know what bzr wants me to commit. <dennda> Ok I will try that, just a sec <dennda> ah wll <dennda> of course <dennda> My programm changes the contents of the files in a directory that comes from Jasons trunk <dennda> And to test if my programm worked I ran it. So it changed these files. <dennda> I don't want to keep them. I just want to take the unaltered files from Jasons trunk. How do I do that? <fullermd> 'bzr revert' will get rid of uncommitted changes and bring your files back to what they were last time you committed. <dennda> What if I also changed the files _before_ I committed last time? <fullermd> Well, then that's something to resolve during the merge. What we're doing now is making it so your working tree is the same as it was last time you committed, so that we can do the merge. <dennda> ok so bzr revert. just a sec <dennda> ok, done <fullermd> The sitution is something like: http://pastebin.ca/678904 <fullermd> Right now, we're on line 11; There are two 14's and two 15's, yours and his. We want to create a new 16 that's descended from both of them. <dennda> Did you draw that right now? <fullermd> "Draw" is probably an overstatement ;) <dennda> Well it's more beautiful than I would have been able to do it. <dennda> So I do have to always do this merge after I commit a change? <fullermd> It looks something like a juniper bush being hit by lightning... <dennda> So I reverted, merged, tried to pull and still get: bzr: ERROR: These branches have diverged. Use the merge command to reconcile them. <fullermd> Well, it depends on the situation. You need to merge when things have diverged. If you and Jason were both working on a single branch, and alternated commits instead, there wouldn't be any merging. <fullermd> Right. There's no way "forward" from your 15 to his 15. <fullermd> So, now do the 'merge', and let's see what it manages to make happen. <dennda> As I said: I already merged <dennda> If I want to do it again it says: bzr: ERROR: Working tree has uncommitted changes. <fullermd> Right. Merge doesn't create the new 16; it just merges those 15's in your working tree. <dennda> So this seems to be quite the same situation as above <fullermd> Look over the changes ('diff'), and make sure the result is what you want. Check 'stat' too, to see which files, and maybe if there are any conflicts. <fullermd> Think you said you wanted his version of a few files, so we may want to adjust those before you commit. <dennda> Ok it's what I want <fullermd> 'k. If it's all how you want it, 'commit' it, which will create the new rev 16 that we want. <dennda> Well at least I hope so ;) <fullermd> Well, if it turns out not to be, claim that somebody snuck into your office and did it. 's what I always do. <dennda> ok i did bzr commit and it opened (to my astonishment) vim, showing me modified files, added files, etc.. <dennda> Sounds like a great strategy for all deeds I want to do <fullermd> "There's no way I could have made that commit! I was busy robbing a bank at that time!" <dennda> Ok, so what do I do with vim? * fullermd blinks. <dennda> it created bzr_log.HOrCoV <fullermd> Put in the log message and all, just like you do on any other commit. <dennda> and opened it in vim <dennda> I don't understand this <fullermd> It's just like any other commit you've made. It just happens to contain a merge, but that doesn't affect anything else about the process. <dennda> doesn't commit need a file specified that shall be committed? <fullermd> Only if you want to commit only a particular file; normally it just checks through the tree for any modified files. <fullermd> (and partial commits aren't supported on merges anyway) <dennda> so it is "bzr commit 'comment'" <duckx> james_w: Well, I need your advice for this <dennda> isn't it? <fullermd> Well, "bzr commit -m 'comment'", if you want to specify the log message on the command line. <duckx> What about chmod 755 debian/rules while import-dsc ? <fullermd> Without the -m, it spawns off $EDITOR for the log message. I hardly ever use -m myself. <james_w> duckx: perhaps that should be added, I'm not sure. <duckx> Well, currently When doing this <duckx> bzr import-dsc <duckx> Then bzr builddeb <duckx> It fails to build because debian/rules not 755 <dennda> fullermd: Ok. So I do push now? <duckx> Well, james_w patch is ready , just wait for your agreement to commit ;) <fullermd> dennda: If you want to push up those combined changes now, yah. <james_w> yeah, it seems reasonable to me. Can you add a debian/changelog entry please. <james_w> and one for your last fix as well if you wouldn't mind. <duckx> Yes shure <duckx> sure, <james_w> thanks duckx <james_w> is there a test for it? <dennda> fullermd: /me feels uncomfortable. <fullermd> How so? <dennda> I pushed now. Pull now tells me: No revisions to pull. <duckx> james_w: you mean unit test ? <james_w> duckx: yeah. <duckx> Nop <duckx> Don't think so <dennda> But I do need to pull in order to get Jasons changes, don't I? <duckx> Ups my mistake :) <fullermd> Not at this point, no. Look back at http://pastebin.ca/678904 <fullermd> His branch is now at his [right-side] 15. Yours is at the 16. So, you have all the changes from his branch already (though he doesn't have yours) <fullermd> So there's nothing for pull to do. <dennda> ok let me see if you tell the truth ;) <duckx> james_w: by the way, what is the next version number 0.90.1 ? <dennda> wow! <dennda> Seems like. <fullermd> Now, your two branches look a little different, of course. His is just a straight line, from 1 to 15, like the right side up through line 11. Yours now has that splitting apart for two revs on each side then the coming back heatherjohnson@example.com. <james_w> duckx: it will probably be 0.91 <duckx> james_w: ok * dato_ wonders why the chmod is done stat.* instead of just 755 <dennda> fullermd: yes i see. and this will always happen if I change anything from my branch? <fullermd> Well, it depends on the particulars of a situation. If we imagine you made your rev 14, but he hadn't done anything, he could pull from you, and you'd both have the same straight 1->14. <dennda> ah <fullermd> When you need a merge is when you've _both_ made different 14's, because now the history has split, and merge is needed to bring it back together. <dennda> I hope I can figure this out on my own next time. (Still seems like "Black wiZzaRdry" to me ;)) <dennda> But I think I understood <dennda> (roughly) <dennda> Thank you, fullermd! <BrianB04> Good morning everyone. <fullermd> No problem :) <james_w> duckx: it would also be good to ensure that debian/rules exists. <duckx> k <james_w> hi BrianB04 <duckx> Doing it right now <james_w> thanks. <BrianB04> I have a silly question, and despite finding some answers, I'm still a bit lost. I want to put my repo on my website. Now, I know you can copy the files to the webserver, but the problem is I have ignores in there, so it will take the ignored files up. Any other way to put it up on the server? <duckx> james_w: isn't debian/rules a mandatory ? <james_w> BrianB04: bzr push <james_w> duckx: yes, I guess you don't have to add the check, but you never know. <BrianB04> Now, with push, you have to commit the first time before you push, correct? <james_w> BrianB04: yes that is correct. <duckx> ok james_w <BrianB04> Then, once I push, do I have to pull it from the server, or is it smart enough to know where it was pushed? <james_w> BrianB04: it will know. <james_w> if it doesn't then you can bzr pull --remember sftp://... or whatever and it will remember from then on. <BrianB04> Very cool. Yea, I think I could get into Bazaar. I work a lot with Rails...and I typically work in what are called User Stories, so each chunk is broken up. With subversion, you have to hold back commiting because you don't want to commit untested code, and blah blah blah...pain. <james_w> :) <BrianB04> Plus, with Bazaar running so nicely on Windows. <james_w> thanks duckx <BrianB04> Now, to get my launchpad account. <BrianB04> You know, it's sad. NearlyFreeSpeech.net is such a superb hosting company, and they charge you for what you use, while Dreamhost, which is a touch expensive and oversells like nuts, just...is awful. <ashish987654321> :) <matkor> Can I force merge with preserving uncommited changes ? <james_w> bzr merge --force? <matkor> james_w: Thanks ! <matkor> jelmer: Could you please merge one more fix for olive-gtk from http://bazaar.launchpad.net/~matkor/bzr-gtk/trunk-matkor ? TIA <jelmer> matkor: Done, thanks! <matkor> jelmer: Thanks! Are you planning release 0.91 soon ? This one with context menu was serious bug ... <aantn> hello <aantn> how can I check the version of a revision I just downloaded? <matkor> aantn: You mean revision number ? bzr log -r -1 ? <aantn> matkor: I need to find out what the number of the lastest revision is <aantn> and bzr log gives too many results <aantn> if I just run "bzr log" <james_w> bzr revno? <BrianB04> Hello all, again:) <dato> aantn: `bzr log -r -1` as matkor said, or just `bzr revno`, which wgives you the number and nothing else <aantn> hello <aantn> kk <aantn> thanks <BrianB04> Okay, another quick question: I pushed up the branch, so it's up on the site, now when I work on the copy on my system, and commit, it commits only to that branch, then I have to push again, and it will merge the changes? <dato> well, in bzr parlance there will be no changes to "merge", just changes to "push". but yes. <BrianB04> I'm an old school CVS/SVN user, so this DRCS is a bit of a mind switch. <james_w> BrianB04: yeah, your local changes are a superset of the remote ones, so you can push no problem, and it will be exactly the same as your local branch. <BrianB04> Only difference is commiting to my branch will never leave the main repo unstable. <james_w> if however you logged in to your server and also made a commit there before pushing the branches have 'diverged', i.e. one is not a superset of the other. <james_w> in those cases you need to merge. <james_w> if you only ever work on one before sychronising then push and pull will be all you need. <BrianB04> Well for the moment it's just me working on it, and since it's all based around sftp, I know I'm the only one that will ever push to it. <james_w> you can also move to a more svn like workflow by running 'bzr bind sftp://remote/' <james_w> which will mean that all your local commits are pushed up to the server as you do them, but that may not be what you want if you are developing experimentally. <cnus8n> hi <james_w> hi cnus8n <cnus8n> I am looking for setting up bazaar and webdav <cnus8n> is there any good tutorial for it? <cnus8n> i have installed the webdav plugin <james_w> I haven't seen one I'm afraid. Does google have anything useful? <cnus8n> I want some help in configuring apache <cnus8n> googling didnt help much <BrianB04> No, I'm thinking I'm going to do what some suggest, having the main repo, branch off that, add features, then merge. <james_w> BrianB04: that's the best workflow in my opinion. <cnus8n> i want to have a central shared repository - but must be able to push changes from outside <BrianB04> james_w: Yea, that sounds like the best idea. Granted, some stuff like licensing and versioning isn't going to be pulled out because that would be...kind of pointless to branch to put in a text file, but otherwise branch. <cnus8n> guys, I tried to setup webdav with bzr and I can do a checkout <cnus8n> but whenever i try to commit, i get an error <cnus8n> bzr: ERROR: File exists: 'https://foo.com/bzr/.bzr/repository/lock/ou6zj1ct2u.tmp' <cnus8n> can someone help <james_w> I've never used the plugin I'm afraid, and I'm not sure how up to date it is. <cnus8n> ok <james_w> ah, vila is the author, but he's not around at the moment. <james_w> it should be reasonably up to date though. <james_w> cnus8n: can you put the traceback you get in to a pastebin please? <cnus8n> I get no traceback - this is the only error message i get <cnus8n> i just changed to foo.com <cnus8n> after i checkout, i make a change and then try bzr commit <james_w> run what you were doing with bzr -Derror and you will get a traceback. <cnus8n> ok <james_w> also the end of ~/.bzr.log will be useful. <cnus8n> http://pastebin.com/m1b527125 <james_w> ok, you are getting a 405 from your browser when you access that url. <james_w> from your server sorry. <james_w> can you open it in your browser please? <cnus8n> you mean https://beta.bioask.com/bzr/ ?? <cnus8n> yeah i can open it <james_w> no the one that is in the error message. <james_w> 405 is "Method not Allowed" <james_w> so I guess your dav configuration isn't correct yet. <james_w> ah, in fact it is doing a MOVE request to the URL in the error, so the browser wont help here. <james_w> sorry a MKCOL request. <BrianB04> So, are there any good web frontends to bazaar branches? <james_w> loggerhead and bazaar-webserve <james_w> some people prefer the former, but it requires turbogears. The latter is plain python, and can serve an individual branch without apache etc. <BrianB04> Can bazaar-webserve serve multiple branches? <james_w> yes, using mod_python or cgi I think. <james_w> cgi is easy. <BrianB04> Or, I could just use Launchpad...which I'm not sure how often they update. <james_w> they pull once an hour when mirroring I belive. <BrianB04> Can't you use Launchpad to host bazaar branches? <mwhudson> if your branch is hosted on launchpad, the codebrowse view is live <BrianB04> Where can I find info on hosting it at Launchpad? <mwhudson> https://help.launchpad.net/CreatingAHostedBranch <BrianB04> Now, if I can figure out how to unregister a branch that hasn't mirrored yet... <grimboy> Hey, I'm having some trouble installing the trac bzr plugin (from https://code.launchpad.net/~jelmer/trac-bzr/aaron ). The exact error is "TracError: Unsupported version control system "bzr". Check that the Python bindings for "bzr" are correctly installed.". I have tracbzr.* = enabled under [components] in trac.ini. I can import tracbzr and bzrlib in from the python prompt. My path and pythonpath are set up to be identical in the shell and the fcgi script. <hsn_> grimboy: what version of bzr you have? <grimboy> 0.90 <hsn_> it worked for me with 0.18 <BrianB04> This is odd, I go to push to /trunk, it says it exists, I use --use-existing-dir and it tells me it doesn't exist. <grimboy> Ah, hmm. <mwhudson> BrianB04: strange <mwhudson> BrianB04: though, hm <mwhudson> BrianB04: it's probably trying to push to a mirrored branch that's confusing it <mwhudson> BrianB04: if it hasn't mirrored yet, you should be able to delete it <BrianB04> Okay, so I finally got one to take, and now it's saying it's not a branch. <BrianB04> I did the bzr init, added, committed then I bzr pushed, now it's saying it's not a branch. <BrianB04> It didn't load the files odd. <BrianB04> All it has is a .bzr directory <james_w> a bz push sftp:// will only put a .bzr on the server. <BrianB04> So that's okay? <james_w> if you do bzr log sftp://... does it show you the whole log? <BrianB04> Yes <james_w> then that's ok <BrianB04> But, when I pull using this address: http://bazaar.launchpad.net/~bbommarito/rbnews/trunk it tells me it's not a trunk, and launchpad is saying it can't import it because it's not a branch. <BrianB04> Or rather it says: Launchpad could not mirror this branch 30 minutes ago. The error was: Not a branch: sftp://bazaar.launchpad.net/~bbommarito/rbnews/trunk <james_w> there's a strange error from the http:// url currently. <BrianB04> Hrmmm, the branch/branch-name is empty. <BrianB04> Oh, so there is an issue with the http connections right now on launchpad? <james_w> it looks that way, try opening the http:// url you pasted in your browser. <james_w> there is a #launchpad if you want to try and sort this out, they will have a better idea than me. <james_w> I think it's on freenode though. <lifeless> moin <BrianB04> Yet, the one I have on my webhost works just fine. <lifeless> james_w: this channel is on freenode :) <james_w> lifeless: oh yeah :) <james_w> morning. <BrianB04> Yea, I was just gonna say. <lifeless> so there is no branch ~bbommarito/rbnews/trunk <lifeless> on the supermirror <lifeless> BrianB04: ~bbommarito/rbnews/trunk exists, but has not been pushed completely <lifeless> BrianB04: you, or the owner, needs to push with bzr to the bzr+ssh, or sftp url. <lifeless> then it will show up on http <BrianB04> Oh, is that what's happening? I wonder what stopped it from pushing properly. Can that branch be trashed, or can I just go right over it? <lifeless> just push again <lifeless> note the error: <lifeless> https://code.launchpad.net/~bbommarito/rbnews/trunk <lifeless> 51 minutes ago <lifeless> ifi this is when you pushed first, there is a race condition that you may have encountered <lifeless> and if thats the case i don't think we have the 'try now' trigger in place - but it will sort it self out automatically <BrianB04> Okay, pushing right now. <yml> Hello <lifeless> hi <yml> I am trying to publish some change from a remote host to launchpad.net with bzr. The problem is that on that host I do not have access to /home/me so I had to put my ssh key directly on www/.ssh. Unfortunatly when I try to push I get the following error message:here it is the message : http://dpaste.com/18451/ bzr is looking at the wrong place to find the key do you know if there is a way to explicitely specify the path? <lifeless> bzr itself doesn't look for the key <lifeless> openssh does <yml> could you be a bit more accurate, I am not sure to understand the problem? <lifeless> bzr uses 'ssh' to connect to launchpad <yml> ok I understand this <lifeless> the ssh key is accessed by ssh <lifeless> its not something bzr has any control over <BrianB04> Yea...I pushed it again, still not wanting to actually pull. <BrianB04> Still giving me the error, but bzr said branch created...so... <lifeless> ok thats an improvement <yml> lifeless: so I guess I need to find quick how to on ssh. do you have any suggestion? <lifeless> google? <lifeless> one thing you could try <lifeless> is to set HOME to a path you do control <yml> ok :-) <lifeless> HOME=somepath bzr ... <lifeless> BrianB04: ok if it said branch created, I think you should push one more time <yml> ok I am going to try this <lifeless> BrianB04: which will trigger a retry. <BrianB04> Oddly enough, pulling via sftp is working. <lifeless> thats normal <lifeless> if you have write access to the branch you go to master copy <BrianB04> Okay, it looks like it's going to wait an hour to grab it, so we will see if it can mirror it in an hour...because pushing again simply says 'nothing to do' <BrianB04> Or No new revisions to push <lifeless> BrianB04: little big huh ? <lifeless> BrianB04: its probably cloning the public copy now <BrianB04> Big? <lifeless> sorrry, I mis-parsed your statement <BrianB04> Yea, it's showing it couldn't clone it like 15 minutes ago. <BrianB04> I'm guessing the http doesn't work until it's cloned. <lifeless> thats right <matkor> Hmmm What is meaning of word 'triaged' in status triaged ? TIA <james_w> matkor: it means it's been looked at but not diagnosed yet. <abentley> Strictly, it means a severity has been picked, but it doesn't mean that the bug has been verified or examined otherwise. <lifeless> james_w: it does not imply lack of diagnosis <lifeless> morning abentley <yml> lifeless : after some investigation I have found out that the $HOME is pointing to the right place <abentley> lifeless: morning. <lifeless> yml: I was suggesting changing it to somewhere you can write to so you can use the ssh key <yml> I mean my key is directly located in this directory .ssh/id_rsa <yml> my key is already there the pb is that bzr /openssh are not looking in that directory but in /home/yml <lifeless> oh <lifeless> well it was a thought <lifeless> you could try using agent mode <lifeless> start ssh-agent on your machine <lifeless> then ssh -A themachineyouarepushingfrom <lifeless> (you need to do ssh-add on your machine too) <james_w> lifeless: wouldn't you use confirmed if
{'channel': 'bzr', 'month': 9}