| Odd_Bloke | abentley: Thanks for the review. :) I'll resubmit tomorrow. | 00:05 |
|---|---|---|
| abentley | Odd_Bloke: np | 00:05 |
| abentley | Odd_Bloke: in fact, KeyError is at least a plausible exception for name_hook to throw. | 00:07 |
| === jamesh_ is now known as jamesh | ||
| mwhudson | does anyone have a clue how to do log-type operations without a whole heap of whole-history operations yet? | 02:16 |
| ubotu | New bug: #200412 in bzr "Undescriptive error message when user isn't part of LP team." [Medium,Confirmed] https://launchpad.net/bugs/200412 | 02:31 |
| red | hi, i ran the command " bzr init-repo sftp://username@silenceisdefeat.org/~/repo" and bzr was hung up without any output. I use bzr 1.2 standalone win32 version under cygwin bash shell. How can I debug my problem? | 02:35 |
| ubotu | New bug: #200413 in bzr-webserve "Rss feeds should show revisions" [Undecided,New] https://launchpad.net/bugs/200413 | 02:36 |
| bob2 | have a look in ~/.bzr.log | 02:39 |
| red | thx | 02:39 |
| === bpeterson changed the topic of #bzr to: "http://bazaar-vcs.org/ | Bazaar 1.2 is out! | https://launchpad.net/bzr/1.2/1.2" | ||
| red | This is the content of .bzr.log: | 03:02 |
| red | bzr arguments: [u'init-repo', u'sftp://username@silenceisdefeat.org/~/repo'] | 03:02 |
| red | looking for plugins in C:/Documents and Settings/jerryc/Application Data/bazaar/2.0/plugins | 03:02 |
| red | looking for plugins in C:/Program Files/Bazaar/plugins | 03:02 |
| red | looking for plugins in c:\Program Files\Bazaar\lib\library.zip\bzrlib\plugins | 03:02 |
| red | Looking for plugins in 'c:\\Program Files\\Bazaar\\lib\\library.zip\\bzrlib\\plugins' | 03:02 |
| red | Names in archive: ['__init__.pyc', 'launchpad/__init__.pyc', 'launchpad/account.pyc', 'launchpad/lp_indirect.pyc', 'launchpa | 03:02 |
| red | I can not figure out from this content. should i install python and bzr source to debug? | 03:05 |
| Peng | red: Certain -D options might help. | 03:06 |
| Peng | I dunno. | 03:06 |
| red | ok, I will try _D | 03:07 |
| bob2 | you need a -Dxxx option, but I can't seem to find the list of them anymore | 03:08 |
| Peng | bzr help global-options | 03:08 |
| Peng | I dunno which one would help though. | 03:08 |
| red | thx | 03:08 |
| Peng | None of them seem relevant to me. | 03:09 |
| Peng | red: Do other things over sftp work? | 03:09 |
| Peng | red: I'd guess it has to do with prompting you for your password. | 03:10 |
| Peng | But I dunno. | 03:10 |
| red | is this command correct " bzr -Derror init-repo --no-tree sftp://chenbin@silenceisdefeat.org/~/repo"? I tried "sftp://username:passwd@url | 03:11 |
| red | there is no prompt for password if i run "sftp://username@url" | 03:11 |
| Peng | Yeah, but -Derror isn't helpful here.. | 03:12 |
| Peng | Does ~ work? | 03:12 |
| Peng | I've never used it. | 03:12 |
| fullermd | On sftp it does; bzr+ssh doesn't. | 03:12 |
| fullermd | (but don't worry, that'll be fixed a release or two after the smart server is added) | 03:12 |
| Peng | I just tried it on both sftp and bzr+ssh and it seemed to screw up badly. | 03:13 |
| red | real command is "bzr init-repo sftp://username@silenceisdefeat.org/~/repo" | 03:13 |
| Peng | Never mind, I'm an idiot. | 03:14 |
| red | I created repo at first on remote server | 03:14 |
| red | I cannot install software on silenceisdefeat.org | 03:15 |
| Peng | (I was using "sftp//" instead of "sftp://".) | 03:15 |
| bob2 | does 'ssh username@silenceisdefeat.org ls ~/repo' work? | 03:15 |
| red | sh username@silenceisdefeat.org "ls ~/repo" does work. | 03:18 |
| red | ssh username@silenceisdefeat.org "ls ~/repo" does work. | 03:18 |
| red | I've got it | 03:20 |
| red | this seems a bug of bzr | 03:21 |
| red | I don't know why, but on the dos command shell, I succeeded and got the password prompt. in the cygwin, there is no password prompt and the whole program is hung up. | 03:22 |
| red | As I mentioned af first, I install bazaar 1.2 standalone version. But I run the bzr command in cygwin bash shell. | 03:23 |
| red | I reported the bug at https://bugs.launchpad.net/bzr/+bug/200436. Thank you all. | 03:33 |
| ubotu | Launchpad bug 200436 in bzr "bazaar 1.2 (standalone) failed in cygwin shell" [Undecided,New] | 03:33 |
| ubotu | New bug: #200436 in bzr "bazaar 1.2 (standalone) failed in cygwin shell" [Undecided,New] https://launchpad.net/bugs/200436 | 04:14 |
| === doko_ is now known as doko | ||
| Farhadix | hi guys , where I can set what revision that I want to branch? | 08:59 |
| Peng | Hopefully he figured it out... | 09:13 |
| muszek | hi... I'm just learning bzr. how would I find out when (which revnos) was a particular file changed? | 09:15 |
| Peng | muszek: bzr log file? bzr annotate file? | 09:15 |
| muszek | Peng: thanks | 09:15 |
| jelmer | dato: ping | 11:21 |
| dato | jelmer: pong | 11:30 |
| jelmer | dato: I was wondering if you could sponsor a bzr-dbus upload? | 11:32 |
| dato | jelmer: yes, I noted it in my TODO when you sent mail to -maint | 11:40 |
| jelmer | dato: Cool, thanks. | 11:41 |
| dato | jelmer: I just need to find a bit of time for it :) | 11:41 |
| jelmer | :-) | 11:41 |
| jelmer | We missed at the sprint last week! | 11:41 |
| * dato wonders if "you" or something else is missing above | 11:42 | |
| jelmer | uhm, yes :-) | 11:42 |
| dato | *g* | 11:43 |
| === mrevell is now known as mrevell-lunch | ||
| === mvo_ is now known as mvo | ||
| === mrevell-lunch is now known as mrevell | ||
| uniscript | any idea when bzr-svn for bzr 1.2 will be available? | 13:46 |
| jelmer | uniscript: Hopefully somewhere at the end of this week | 13:49 |
| uniscript | OK great ta | 13:49 |
| === FreeNode is now known as herb | ||
| nevans | jelmer: I'm up to date with http://people.samba.org/bzr/jelmer/bzr-svn/stable/, and I'm getting "using experimental bzr-svn mappings; output may change between revisions" . . . there's nothing to worry about as far as normal usage (esp. with respect to data-loss), is there? :-) | 14:01 |
| jelmer | nevans: you should not be using it for production type data but a release instead | 14:03 |
| ubotu | New bug: #200569 in bzr "[PATCH] v1.2 setup.py fails under python 2.3.5" [Medium,Confirmed] https://launchpad.net/bugs/200569 | 14:04 |
| nevans | jelmer: thanks. I'll switch to one of the release branches. | 14:07 |
| nevans | jelmer: should I delete my svn-cache or my bzr repo? could running off of the newer code have "corrupted" either of them so that the older release branch of bzr-svn won't know how to cope? | 14:12 |
| ubotu | New bug: #200575 in bzr ""Address already in use " crashes smart server" [Undecided,New] https://launchpad.net/bugs/200575 | 14:16 |
| jelmer | nevans: In theory, yes. In practice however, there haven't been any regressions recently afaik | 14:17 |
| LarstiQ | jelmer: s/adaption/adoption/ | 14:21 |
| jelmer | LarstiQ: ? | 14:22 |
| LarstiQ | jelmer: the title of your blog post :) | 14:23 |
| jelmer | doh! | 14:23 |
| AfC | jelmer: I forgot to ask you last week. What's the bzr-svn release that corresponds to bzr 1.2? | 14:39 |
| jelmer | AfC: There is none yet | 14:39 |
| jelmer | I had meant to release it last week but was distracted by other things | 14:40 |
| AfC | I'm sitting here at the GTK hackfest listening to these guys next to me absolutely slaughter themselves fighting with git usage. I'd like to just go "and here it is in bzr" but I kinda need to have my shit together first | 14:40 |
| AfC | jelmer: certainly | 14:40 |
| AfC | jelmer: no worries | 14:40 |
| * AfC wonders if his distro has backported the subversion changes that bzr-svn relies on. | 14:41 | |
| jelmer | AfC: what distro are you running? | 14:41 |
| AfC | I hope so. I had a very poor time trying to get subversion working built from source. | 14:41 |
| AfC | jelmer: Gentoo | 14:41 |
| jelmer | AfC: There is an overlay (not sure what that means exactly) that has them | 14:41 |
| jelmer | https://edge.launchpad.net/bzr-gentoo-overlay | 14:41 |
| AfC | jelmer: overlay is the equivalent of "well, I posted a patch". Until it's into Gentoo's official tree it's meaningless. | 14:42 |
| jelmer | ah, ok | 14:42 |
| AfC | It's like expecting people to depend on a .deb that's not official. It may exist, but it's not usable without a fight | 14:42 |
| fullermd | Don't worry, it'll all be fixed when svn 1.5 is released... I'm sure it'll happen in a week or two, no problem. | 14:43 |
| AfC | fullermd: oh really? That's encouraging | 14:43 |
| AfC | [Part of this is that someone did an import of GTK using launchpad, but that's really not any use so long as the upstream project is using Subversion] | 14:44 |
| fullermd | Well, it's been a couple weeks out for, like, 18 months now... | 14:44 |
| AfC | I suppose I could risk trying that overlay. I don't know who wrote it, what's in it, or whether it is trustworthy. | 14:44 |
| AfC | fullermd: that too | 14:44 |
| AfC | Now if launchpad used bzr-svn, THAT would be useful. | 14:45 |
| Peng | Using other overlays in Gentoo is pretty easy, IIRC. | 14:46 |
| Peng | More like adding something to your /etc/apt/sources.list. | 14:46 |
| AfC | I didn't say it wasn't easy. I said it wasn't sound | 14:46 |
| Peng | Ok. | 14:46 |
| AfC | [and even more pragmatically, in my experience when someone does a private overlay the problem goes away for them so they no longer are incented to push their work to upstream (in this case, the distro proper) - which means the problem remains unsolved for everyone else] | 14:47 |
| AfC | [so, for me to go and use that overlay would mean I would no longer be agitating for the problem to be fixed, and the quality level for everyone else remains low. Far better for bzr if the necessary fixes get into Portage officially] | 14:48 |
| === bigdo2 is now known as bigdog | ||
| Odd_Bloke | AfC: LP does SVN imports... | 15:10 |
| AfC | Odd_Bloke: but you don't mean "using bzr-svn to publish a branch which is actually backed by an external project that is in Subversion" do you? | 15:11 |
| Odd_Bloke | AfC: Probably not, but I'm not sure I understand exactly what you mean. :) | 15:11 |
| AfC | import (as I understand it) is a one way transform for a project that is switching VCS. bzr-svn allows you to use Bazaar against an upstream project that uses (and will continue to use) Subversion | 15:12 |
| AfC | what I was just suggesting would be interesting & cool would be | 15:12 |
| Odd_Bloke | AfC: LP does tracking imports, so that any new upstream revisions are mirrored. | 15:12 |
| AfC | if Launchpad hosted the bzr-svn infrastructure and sync'd against upstream | 15:12 |
| AfC | Hm. | 15:12 |
| jelmer | AfC: it has been discussed in the past | 15:13 |
| AfC | jelmer: I didn't really think it was likely to be an original idea | 15:13 |
| AfC | I'm probably only sensitive to this because it's taken a while for me to get bzr-svn up and running | 15:13 |
| jelmer | AfC: However, the restrictions that bzr-svn puts on the way conversions are done make it impossible to be used by launchpad | 15:13 |
| AfC | Well, I'm just as happy to leave them out of it. | 15:14 |
| jelmer | AfC: bzr-svn uses deterministic revision ids so can't change the way mappings are done without changing the revision ids | 15:14 |
| abentley | jelmer: oh? What restrictions are these? | 15:14 |
| AfC | jelmer: interesting | 15:14 |
| jelmer | abentley: I meant the referential integrity has to be maintained | 15:15 |
| abentley | Why is that a problem? | 15:15 |
| jelmer | it makes it impossible to change the mappings halfway through | 15:17 |
| jelmer | without changing revids | 15:17 |
| jelmer | if I add support for svn:keywords in bzr-svn now, I need to change the revision id prefix it's using | 15:17 |
| jelmer | wheras launchpad could just add support for it and add it in the new revisions it imports without users getting funny "Branches diverged" errors | 15:18 |
| abentley | Otoh, deterministic conversions are useful, and Launchpad might be willing to put up with that upgrade pain for such a gain. | 15:20 |
| jelmer | abentley: True, but afaik that was the reason launchpad decided against bzr-svn a while back | 15:21 |
| jelmer | abentley: btw, did path tokens get discussed later in the week during the sprint ? | 15:22 |
| abentley | No, they were never discussed. | 15:22 |
| Odd_Bloke | Could someone vote 'Resubmit' on http://bundlebuggy.aaronbentley.com/request/%3C20080310005229.11704edf@lapbert.oxbridgetech%3E for me? | 15:22 |
| abentley | Odd_Bloke: Just submit the fixed version. | 15:23 |
| jelmer | abentley: :-( | 15:23 |
| Odd_Bloke | abentley: Sure. :) | 15:24 |
| jelmer | hmm, I think this is the first year I haven't brought up revision id aliases | 15:24 |
| jelmer | :-P | 15:24 |
| === weigon__ is now known as weigon | ||
| Prodoc | Earlier I started with putting an existing project folder under version control (init, add, commit), now I'd like to have that folder as a repository and move the existing files to a subfolder ('main') to allow me to create branches in separate folders next to the 'main' subfolder. How should I proceed? Is it possible to do this afterwards and keeping the current revisions? | 16:01 |
| Odd_Bloke | Prodoc: Create a separate shared repo (using 'bzr init-repo repo') and 'bzr branch <existing dir> repo/main'. | 16:04 |
| Prodoc | Odd_Bloke: performing 'bzr branch <existing dir> repo/main' before or after I copied the existing project (including the .bzr folder I assume), to the 'main' folder? | 16:06 |
| Odd_Bloke | Prodoc: The 'bzr branch' will do the copying, as well as using the shared repository. | 16:07 |
| Prodoc | so I just have to perform the 'bzr init-repo repo' on the current version controlled folder? | 16:09 |
| Odd_Bloke | Prodoc: It's best to do it outside of the version-controlled folder, to avoid confusion. | 16:10 |
| Odd_Bloke | You can move the repository (and it's branches) where you want later. | 16:10 |
| Prodoc | ah yes, now I see what you mean, cheers | 16:12 |
| Prodoc | ow, and the existing revision history will be retained? | 16:14 |
| LarstiQ | yes | 16:14 |
| LarstiQ | hi poolie | 16:14 |
| Pengwn | How is bazzar diff from git ? | 16:18 |
| LeoNerd | How is an orange different to an apple? | 16:18 |
| Pengwn | ok I will get to the point. | 16:19 |
| Odd_Bloke | git has a lot more citric acid? :p | 16:20 |
| Pengwn | I found these distributed scms suffer compatibility between windows and linuxes | 16:20 |
| Pengwn | not really distribted. | 16:20 |
| LeoNerd | Also bear in mind that while we're bzr users in here, many of us won't know git that well | 16:20 |
| LeoNerd | Or at all | 16:20 |
| Pengwn | basically how easy to get my revisions between windows and linux machines. | 16:21 |
| Pengwn | so I don't have to worry about setting up ssh or starting a deamon to pull/push to and from. | 16:21 |
| LarstiQ | afaik, bzr still has better windows support than git | 16:21 |
| Peng | Bazaar has pretty good Windows compatibility, but not many of the developers concentrate on Windows, and it has case-insensitive issues. | 16:21 |
| LeoNerd | The repo format is portable, the program is portable... to my knowledge though, bzr won't itself handle linefeed issues | 16:21 |
| LarstiQ | Peng: indeed | 16:21 |
| LarstiQ | LeoNerd: we want to do that though | 16:22 |
| Pengwn | I don't mind even if would handle ascii files as binary objs. | 16:23 |
| Peng | The current workaround is using a text editor that doesn't suck. :P | 16:23 |
| fullermd | Oh, that's not necessarily a requirement. People could even use emacs... | 16:23 |
| Pengwn | or vim. | 16:24 |
| LarstiQ | tsk :P | 16:24 |
| LeoNerd | (g)vim can easily cope with either line format anywhere | 16:24 |
| LeoNerd | But.. I imagine you're going to be storing source code, etc..? | 16:24 |
| LarstiQ | the problem is other tools, like, say, patch | 16:24 |
| LeoNerd | Make sure the compiler/interpreter on each platform can cope | 16:24 |
| luks_ | LarstiQ: patch will happily convert line endings | 16:24 |
| LarstiQ | luks_: does it nowadays? It sure used to convert everything to native on windows. | 16:25 |
| luks_ | at least the one on windows does | 16:25 |
| LarstiQ | anyway, for interested people, http://bazaar-vcs.org/SprintLondonMarch08/Brainstorms and http://bazaar-vcs.org/LineEndings would be starting points for implementing it | 16:26 |
| Pengwn | I just need a simple tool to efficently transfer versioned binary diffs between windows and linux and not worry about setting up a whole lot of servers doing push and pull it should simply ask during syncing chose the remote and local when conflicts arrive. | 16:26 |
| luks_ | Pengwn: that's as trivial as running "bzr send" | 16:26 |
| luks_ | LarstiQ: the problem with implementing in is that bzrlib reads from the working tree all over the source base :( | 16:27 |
| luks_ | there is no central place for such operations | 16:27 |
| Pengwn | when I do bzr send from a window machine how would the other window machine recieve it? | 16:27 |
| LarstiQ | luks_: reads or writes? | 16:28 |
| luks_ | both, and md5sums | 16:28 |
| LarstiQ | luks_: the idea is to have a transform layer via tree operations | 16:28 |
| luks_ | I've tried it a few months ago, but I gave up as it would mean refactoring quite a lot of code | 16:28 |
| luks_ | Pengwn: "bzr send" works over email | 16:29 |
| LarstiQ | luks_: did you document your experiences somewhere? | 16:29 |
| luks_ | so yuou get the patch by mail, and then "bzr pull" it | 16:29 |
| luks_ | LarstiQ: nope | 16:29 |
| LarstiQ | ok | 16:29 |
| luks_ | just in my private and probably already deleted branch :) | 16:29 |
| LarstiQ | doh :P | 16:29 |
| Pengwn | to put it a little simpler I would like to have versioned files with unison syncing and samba transparency. | 16:30 |
| Pengwn | any tool that would remove the trouble of setting up samba would be awesome. | 16:30 |
| luks_ | not sure if that's simpler | 16:30 |
| * luks_ doesn't know that means :) | 16:30 | |
| luks_ | Pengwn: bzr is a version control tool, not a backup solution and not directory sync tool | 16:31 |
| luks_ | if your only intention is to move files between machines, bzr or any other vcs is probably not going to make you happy | 16:32 |
| Pengwn | yep that's what I am looking for then a versioned diff backup solution able to sync from any linux window system. | 16:32 |
| LeoNerd | unison ? | 16:35 |
| LeoNerd | I've only used it between Linux boxen, but I know it's designed for Lin/Win or Win/Win too | 16:35 |
| Pengwn | problem with unison it goes thru the whole directory structure and takes to much band width this way git handles better with sha1 comparison but pulling and pushing to linux is ok but to windows is a pain in the *** | 16:37 |
| LeoNerd | Umm... | 16:38 |
| LeoNerd | unison runs on both machines | 16:38 |
| LeoNerd | It does local timestamp and checksumming, nowhere near the network | 16:38 |
| LeoNerd | You have to run it _on_ both machines, though | 16:39 |
| LeoNerd | Running it on one side to do a local-to-SMB isn't going to gain you anythingh | 16:39 |
| Pengwn | how hard is it to setup bazar to do bzr send and get ? | 16:42 |
| poolie | Pengwn: pretty easy, assuming there is a reasonable way to send mail from the source | 16:43 |
| poolie | like either sendmail or an smtp server | 16:43 |
| Pengwn | can I unison to sync directories then use bzr on top of it ? | 16:44 |
| Pengwn | I mean bzr locally on windows and linux boxes? | 16:44 |
| Pengwn | sync directories or repos i.e. | 16:45 |
| luks_ | another option would be "bzr serve" if you can temporarily open a port on one of the machines, and they are accessible from each other | 16:45 |
| Pengwn | bzr serve is a python server? | 16:45 |
| Pengwn | or c server? | 16:45 |
| awilkins | Python | 16:46 |
| luks_ | almost everything in bzr is python | 16:46 |
| Pengwn | is bzr server a push pull thing or I can commit and checkout from it like cvs? | 16:46 |
| luks_ | both | 16:47 |
| Pengwn | cool. | 16:47 |
| luks_ | but it doesn't handle any authentification | 16:47 |
| Pengwn | fine with me. | 16:47 |
| Pengwn | atleast plain text passwords? | 16:47 |
| awilkins | No | 16:47 |
| luks_ | nope, nothing | 16:47 |
| awilkins | Use bzr+ssh if you want security | 16:48 |
| Pengwn | ssh is not for windows :) | 16:48 |
| awilkins | There are SSH daemons for Win32 AFAIK | 16:48 |
| Pengwn | another big problem otherwise would have stuck to git. | 16:48 |
| awilkins | You can certainly use windows as a client to bzr+ssh | 16:48 |
| luks_ | https://code.launchpad.net/~parker-friikz/bzr-auth/trunk | 16:49 |
| * awilkins has done it | 16:49 | |
| Pengwn | can I limit the clients to bzr serve? | 16:49 |
| Pengwn | client connection i.e.? | 16:49 |
| Pengwn | say to one. | 16:49 |
| Parker- | heh | 16:49 |
| Parker- | maybe I should continue with that :P | 16:50 |
| luks_ | Pengwn: are you planning to use it on a central server? | 16:50 |
| luks_ | Parker-: you shuold! :) | 16:50 |
| luks_ | is it usable yet? | 16:50 |
| Parker- | mostly yes | 16:50 |
| Parker- | :D | 16:50 |
| Parker- | but.. it works | 16:51 |
| luks_ | Pengwn: if it's a central server and it runs any unix based system, you can just use bzr+ssh | 16:51 |
| luks_ | which works fine on windows as a client | 16:51 |
| Parker- | need to leave train.. laters.. | 16:52 |
| Pengwn | Ok this is the scenario. I work on windows , linux boxes all over the place I want to commit/checkout on any box and before leaving in the evening to save my code/commits on any spare box available at the client side. I work mostly in a vpn so I can connect to any box but don't want to go thru headace setting up ssh/samba what ever crap. | 16:53 |
| awilkins | Pengwn: if ssh is installed on your target psuh box, your headache is limited to generating keypair for yourself and adding it to the authorized_keys list in your /home/.ssh folder on the target | 16:56 |
| awilkins | And then running pageant / putty on the Win32 bopx | 16:56 |
| luks_ | or just to use password :) | 16:56 |
| awilkins | luks_: Ah, well, I learned to do it before bzr had auth callbacks :-) | 16:56 |
| awilkins | It finally pushed me over to using PK auth for everything, none of my boxen support password anymore. | 16:57 |
| awilkins | Anyway, yes, Pengwn, you just need plink (from putty suite) to use win32 as an ssh client. Small, no-install executable. | 17:00 |
| luks_ | actually, you don't | 17:00 |
| awilkins | Other client in mind? | 17:00 |
| luks_ | the bzr installer comes with paramiko installed | 17:00 |
| luks_ | which provides ssh support without any external dependencies | 17:00 |
| * awilkins ... is out of date because of the auth-callbacks thing | 17:01 | |
| awilkins | I needed something with an ssh-agent | 17:01 |
| luks_ | paramiko _can_ use putty's ssh agent :) | 17:01 |
| Pengwn | awilkins: the headace there is I am working on a windows box all day after ftping my repo now I come to my hotel room connect to slow vpn and save changes to a windows laptop. ftp is again damn slow and remote windows box doesn't have ssh setup. | 17:02 |
| awilkins | Have to go catch train back later | 17:03 |
| luks_ | Pengwn: bzr will download only as much as it needs, which usually isn't that much after one working day | 17:04 |
| Pengwn | you mean with bzr serve? | 17:04 |
| Pengwn | or bzr-ssh? | 17:04 |
| luks_ | any transport | 17:04 |
| luks_ | you would simple replace the 'ftping my repo' step with 'bzr push' | 17:04 |
| luks_ | and then 'bzr pull' on the laptop | 17:04 |
| Pengwn | cool. | 17:05 |
| Pengwn | I will try that out then. | 17:05 |
| luks_ | you can use sftp://, ftp://, bzr+ssh://, bzr:// | 17:05 |
| Pengwn | thanks luks. | 17:05 |
| Pengwn | so bzr is well supported on windows and linux very well? | 17:06 |
| Pengwn | I mean my bzr serve should hang I am screwed again. | 17:06 |
| luks_ | bzr works equally on windows and linux | 17:07 |
| luks_ | the only things that are different are caused by missing features of either OS | 17:07 |
| Pengwn | the best windows scm server is p4s.exe. perforce's. Never hanged on me maybe once. | 17:07 |
| Pengwn | basically I have to say how well is python on windows : ) | 17:08 |
| luks_ | but probably the best you can do is to always push the changes to one server and use that server from each machine you are working on | 17:08 |
| Pengwn | that's the problem. servers sometimes in different location country and bandwidth sucks. | 17:09 |
| LarstiQ | Pengwn: it's not clear to me exactly what problem you are trying to solve. | 17:10 |
| Pengwn | admin problems automation problems etc. etc. huge repo like 2GB and need to transfer around on different client places. | 17:11 |
| Pengwn | yeah maybe I should stip down the take away the exe/binaries but damn lazy to do that so code and installables all in one repo.:) | 17:13 |
| ubotu | New bug: #200599 in bzr "exception error "Connection reset" caused by push" [Undecided,New] https://launchpad.net/bugs/200599 | 17:33 |
| === FreeNode is now known as herb | ||
| Bloguero__Connor | what the difference between init and init-repo? | 18:00 |
| beuno | Bloguero__Connor, init-repo is a shared repository | 18:00 |
| Bloguero__Connor | so, init is only for private? | 18:01 |
| beuno | Bloguero__Connor, I wouldn't call it private, it's jsut for one repository | 18:01 |
| beuno | the otbher one shares the revisiones | 18:01 |
| beuno | so it saves space if you're branching the same repo | 18:02 |
| fullermd | Er. init-repo creates a shared repo; init creates a branch. | 18:02 |
| Bloguero__Connor | wich one saves space? | 18:02 |
| james_w | and init will create a non-shared repo if you are not in a shared repo when you call it. | 18:03 |
| beuno | Bloguero__Connor, it depents on what you're going to do ;) | 18:03 |
| james_w | "bzr help repositories" | 18:04 |
| Bloguero__Connor | OK. If someone creates a sharedrepo at http://someplace.com/repoX, and I want to colaborate, should I use "bzr branch http://..."? | 18:08 |
| beuno | Bloguero__Connor, share repos are only relevant locally | 18:08 |
| Bloguero__Connor | why? | 18:08 |
| Odd_Bloke | Bloguero__Connor: A 'shared' repo is only called 'shared' because multiple branches use it to store revisions. | 18:08 |
| Odd_Bloke | Those branches share the repository. | 18:09 |
| Bloguero__Connor | If I have sftp access to the shared repo, what diff make if it is local or in another machine? | 18:14 |
| beuno | Bloguero__Connor, none | 18:15 |
| Bloguero__Connor | beuno, you said before that share repos are relevant only locally | 18:16 |
| beuno | Bloguero__Connor, right, because they save space when creating new branches in the shared repo | 18:16 |
| beuno | they re-use the same common revisions | 18:16 |
| beuno | so you don't duplicate them | 18:16 |
| beuno | but it makes no difference when branching out externally | 18:16 |
| Odd_Bloke | Bloguero__Connor: I think you may be being confused by the use of the word 'repository'. In bzr, a repository is _only_ a place to store revisions. Branches are what make sense of these revisions (and are what you can share in the way you seem to mean). | 18:18 |
| Bloguero__Connor | so share repo is called shared because it shares files between branches, not because it shares branches between users. | 18:18 |
| Odd_Bloke | Bloguero__Connor: Yes. :) | 18:19 |
| Pengwn | guys back. | 18:20 |
| Pengwn | I did bzr serve --directory=c:\myhome | 18:21 |
| Pengwn | how do i access or sync with this from another windows machine? | 18:21 |
| beuno | Pengwn, bzr://host/branch | 18:23 |
| Pengwn | I am getting errors saying bzr: ERROR: not a branch "C:/myhome/" | 18:23 |
| Odd_Bloke | Pengwn: Is C:/myhome/ a branch? | 18:24 |
| Pengwn | using bzr pull bzr://141.144.64.18:4155/myhome | 18:24 |
| Pengwn | nope directory. | 18:24 |
| Odd_Bloke | Pengwn: That'll be your problem then. You can only pull from branches. | 18:25 |
| Pengwn | is branch nick and branch one and the same? | 18:26 |
| james_w | Pengwn: no | 18:27 |
| Pengwn | ok how to create a branch and serve it? | 18:27 |
| Pengwn | there's no default branch? | 18:27 |
| james_w | Pengwn: "cd branch; bzr serve" | 18:28 |
| james_w | or "bzr serve --directory=c:\location\of\branch" | 18:28 |
| luks_ | Pengwn: bzr init & bzr add (or be more specific here) & bzr commit | 18:29 |
| Pengwn | cd c:\myhome; bzr init ; bzr add; bzr commit ; bzr serve ?? | 18:29 |
| Pengwn | then on my other machine bzr pull bzr://141.144.64.18:4155/myhome ?? | 18:30 |
| beuno | Pengwn, that's right, if you just want to have one branch, yes | 18:30 |
| luks_ | you probably don't want to do add your whole home directory, though | 18:30 |
| beuno | luks_, it's a windows home, it's probably empty :p | 18:31 |
| beuno | james_w, does bazaar still use absolute paths with the smart server, or deso it do relative now? | 18:32 |
| LarstiQ | beuno: in what sense? | 18:32 |
| james_w | beuno: I don't know I'm afraid. | 18:32 |
| LarstiQ | if I do bzr serve --directory ~/src/bzr ; then bzr branch bzr://larstiq/bzr.dev works | 18:32 |
| beuno | LarstiQ, that's it | 18:32 |
| beuno | thanks :D | 18:33 |
| james_w | beuno: how is Prague? | 18:33 |
| beuno | james_w, absolutely great. Having a chance to get back some brain-functions working :p | 18:33 |
| james_w | :-) | 18:33 |
| beuno | james_w, tomorrow is your last day at previous work? | 18:34 |
| dato | james_w: hey, meant to ask the other day: are you coming to debconf? | 18:34 |
| james_w | Does anyone know who admins planet.bazaar-vcs.org? | 18:34 |
| dato | LarstiQ: same for you | 18:34 |
| james_w | beuno: yes it is \o/ | 18:34 |
| james_w | dato: I wasn't planning on it, but it sounds like there may be a chance that I am now. | 18:34 |
| dato | james_w: ok :) | 18:35 |
| beuno | james_w, so from when on can I start complaining about Ubuntu doing things wrong to you? | 18:35 |
| james_w | beuno: um, you'd be better of complaining to someone else? :) | 18:35 |
| Pengwn | oh damn do i have to bzr init on both machines? | 18:36 |
| beuno | Pengwn, no, just do branch instead of pull | 18:36 |
| beuno | (once, to create the initial branch) | 18:36 |
| james_w | dato: I think it would be great if at some point you could send a message to the list outlining the features that made git so compelling for you. | 18:36 |
| james_w | dato: I realise you have mentioned a couple already, which is better than most people who just say that there are things without really pointing them out, so thanks for that. | 18:37 |
| dato | ok, I could think about them | 18:38 |
| * dato takes a note | 18:38 | |
| james_w | dato: thanks. | 18:38 |
| LarstiQ | dato: I had been filling in fields in penta slowly, I need to complete that. | 18:42 |
| Pengwn | Wow bzr is cool on windows. | 18:46 |
| Pengwn | hope it's equivalently cool on linux :) | 18:46 |
| Pengwn | by next best tool :) | 18:47 |
| beuno | Pengwn, like everything else, even cooler :p | 18:47 |
| LarstiQ | beuno: now now :P | 18:48 |
| Pengwn | but seems I have to go the physical c:\myhome directory and do bzr pull bzr://hostname:4155 | 18:48 |
| * beuno goes back to his corner and sits back down again | 18:48 | |
| Pengwn | the bzr://hostname:4155/myhome doesn't work. | 18:49 |
| Pengwn | says c/myhome/ is not a branch. | 18:49 |
| === ja1 is now known as jam | ||
| Odd_Bloke | jam: o/ | 18:50 |
| LarstiQ | Pengwn: what does `bzr info` say when in c:\\myhome ? | 18:50 |
| jam | Odd_Bloke: hi | 18:51 |
| Odd_Bloke | jam: Thanks for the reviews earlier. :) | 18:51 |
| jam | np, trying to get the merge queue down to something reasonable | 18:51 |
| jam | Odd_Bloke: did you have a good train journey back home? | 18:52 |
| Odd_Bloke | jam: Yeah, managed to get a seat and everything. :p How was your flight? | 18:52 |
| Pengwn | branch root: . | 18:52 |
| Pengwn | Related branches: | 18:52 |
| Pengwn | parent branch: bzr://141.144.65.18:4155/ | 18:52 |
| james_w | hi jam. | 18:53 |
| jam | The flight was rather uneventful, they managed to arrive 30-min early, but then take >1hr to get my luggage unloaded | 18:53 |
| jam | hi james_w | 18:53 |
| Odd_Bloke | Perhaps the luggage arrived on time. :p | 18:53 |
| jam | Pengwn: and you did "cd c:; bzr serve" first? | 18:54 |
| jam | (if you did cd C:\myhome, then the appropriate branch is "bzr branch bzr://hostname/" | 18:54 |
| Pengwn | no cd c:\myhome; bzr serve | 18:54 |
| jam | Since paths are relative to the cwd | 18:54 |
| jam | otherwise it would be branching "c:\myhome\myhome" which obviously doesn't exist | 18:55 |
| Pengwn | hey thanks | 18:57 |
| Pengwn | bzr://hostname:4155/myhome works | 18:57 |
| dato | LarstiQ: ok :) | 18:57 |
| Pengwn | after cd c:\ ; bzr serve | 18:57 |
| Pengwn | how the hell it bzr know c:\myhome is the bzr root without being in it? | 18:58 |
| Odd_Bloke | Pengwn: Because that's where you ran 'bzr serve' from? | 18:58 |
| radix | Peng: it maps URLs to file system paths | 18:58 |
| radix | erg. pengwn | 18:58 |
| Pengwn | ahh got now cd c:\myhome; bzr://hostnaem:4155/ fails :) | 18:59 |
| Pengwn | The logic is then If bzr serve find the BZR ROOT client cannot use the path info. If bzr serve doesn't find the BZR ROOT the client has to tell it where to find it. :) | 19:02 |
| LarstiQ | Pengwn: bzr serve doesn't care where it is run from, it will take an incoming request and then look in $serveroot + $relpath | 19:04 |
| LarstiQ | Pengwn: so yes | 19:04 |
| poolie | hello jam | 19:05 |
| LarstiQ | Pengwn: you could also (on a unix system) do `bzr serve --directory=/` and that way expose your entire filesystem, but you probably don't want that | 19:05 |
| jam | hi poolie | 19:05 |
| jam | How was your travel back? | 19:05 |
| Pengwn | LarstiQ: what is the $serverroot on windows it just says . | 19:06 |
| poolie | not too bad | 19:06 |
| poolie | you? | 19:06 |
| beuno | Pengwn, wherever you specified bzr serve to run from | 19:06 |
| LarstiQ | Pengwn: it is either the directory you run bzr serve from, or what you specified with --directory | 19:06 |
| Pengwn | I gues it cannot transalte c: and d: etc then ? | 19:07 |
| LarstiQ | Pengwn: so 'cd c:/myhome/; bzr serve', $serverroot would be 'c:/myhome'. | 19:07 |
| LarstiQ | Pengwn: what do you mean? | 19:07 |
| beuno | Pengwn, you might be able to use shortcuts to link to d:, but windows is a bit uncertain for me | 19:08 |
| beuno | LarstiQ, I think he means server contents from c:/foo and d:/bar | 19:08 |
| LarstiQ | beuno: hmm | 19:08 |
| beuno | you know, there is no / in win | 19:08 |
| mneptok | beuno: there is if your machine meets the Windows Vista Ultimate POSIX Professional Edition minimum hardware specs. | 19:10 |
| beuno | mneptok, you mean kubuntu with the vista skin? :p | 19:10 |
| davi | welcome to emacs | 19:11 |
| Pengwn | once the bzr serve finds the BZR root it always give $server + $relpath ans not a branch. | 19:11 |
| Pengwn | it recongnizer "c:/myhome" and not "c:\myhome" | 19:12 |
| Pengwn | so once it finds the root and i say bzr pull bzr://hostname:4155/proj1 it doesn't find it. | 19:13 |
| Pengwn | i have to cd c:\myhome\proj1 and then do bzr pull bzr://hostname:4155 | 19:13 |
| LarstiQ | Pengwn: this sounds wrong | 19:13 |
| LarstiQ | Pengwn: you have a bzr server running from c:/myhome, right? | 19:14 |
| Pengwn | windows is always wrong for me :) | 19:14 |
| Pengwn | yep. | 19:14 |
| LarstiQ | Pengwn: could you then try mkdir c:\temp; cd c:\temp; bzr branch bzr://hostname/proj1 | 19:14 |
| Pengwn | bzr serve --directory="c:/myhome" | 19:14 |
| Pengwn | I am in C: | 19:15 |
| LarstiQ | Pengwn: could you try my way first? I'd like to rule out funky window pathnames first | 19:15 |
| Pengwn | C:\myhome>bzr pull bzr://141.144.65.18:4155/proj1/ | 19:16 |
| Pengwn | bzr: ERROR: Not a branch: "bzr://141.144.65.18:4155/proj1/". | 19:16 |
| mtaylor | statik: ping | 19:17 |
| LarstiQ | Pengwn: that's not really what I asked you :P | 19:17 |
| * LarstiQ is tempted to boot into windows and check | 19:17 | |
| Pengwn | I just have to be out of the location where there is no .bzr directory and then the bzr://hostname:4155/path works. | 19:20 |
| Pengwn | some how my PWD is overiding the branch infomartion to the bzr serve. | 19:25 |
| Pengwn | ok got to go now. | 19:26 |
| AfC | You shouldn't have to specify the port number | 19:28 |
| jam | poolie: overall uneventful, which is how I prefer travelling :) | 19:29 |
| poolie | hello afc | 19:30 |
| AfC | Good evening Martin | 19:30 |
| mneptok | hey poolie | 19:31 |
| james_w | poolie: hi. How are you? | 19:47 |
| james_w | poolie: who is it that admins the bzr planet? | 19:48 |
| poolie | good, thankyou | 19:48 |
| poolie | though in an unusual personal timezone | 19:48 |
| poolie | canonical IS | 19:48 |
| poolie | I can pass on requests or comments | 19:48 |
| james_w | poolie: I thought it was a little early for you. | 19:48 |
| james_w | I would like to be added if you approve, does that need to go through them? | 19:49 |
| poolie | that's probably easiest if you don't find them here | 19:51 |
| poolie | lamont (in us/mountain time) can do it for example | 19:51 |
| poolie | can you pm me the urls | 19:52 |
| poolie | or mail | 19:54 |
| jelmer | abentley: ping | 19:55 |
| * lamont notes that #canonical-sysadmins is where one can generally expect to find zero or more awake sysadmins | 19:55 | |
| lamont | (this server) | 19:55 |
| abentley | jelmer: pong | 19:55 |
| jelmer | abentley: Do you know how to get kid to not insert a HTML header above pages? | 19:55 |
| * jelmer has a bundlebuggy patch which adds rss feeds and this is the last bit he can't get to work | 19:56 | |
| poolie | lamont, james_w: sent | 19:56 |
| abentley | The header will be coming from your master template. | 19:56 |
| james_w | poolie: thanks. | 19:56 |
| jelmer | abentley: I mean the <!DOCTYPE > line on top, which is inserted even while it is not there in my kid template | 19:56 |
| abentley | jelmer: one sec | 19:57 |
| mwhudson | did i show this screenie off in here yet? http://people.ubuntu.com/~mwh/hacked_up_changelog_view_3.png | 19:57 |
| poolie | mwhudson: released yet? :) | 19:57 |
| mwhudson | poolie: well, i released 1.2 and 1.2.1 yes | 19:58 |
| mwhudson | poolie: that changelog view is not even committed to a branch though i think, it's a total hack | 19:58 |
| poolie | oh, interesting | 19:58 |
| abentley | jelmer: expose it like this: "@expose(template='livelistings.templates.atom_events', format='xml', content_type='application/xml')" | 19:58 |
| LarstiQ | mwhudson: fair enough :) | 19:59 |
| jelmer | abentley: Thanks! | 19:59 |
| poolie | mwhudson: i don't think you need different font sizes btw | 19:59 |
| abentley | The content_type would probably be different. | 19:59 |
| poolie | they're already distinguished by placement and weight | 19:59 |
| jelmer | abentley: yep, application/rss+xml probably | 20:03 |
| jelmer | it works \o/ | 20:03 |
| mwhudson_ | grr | 20:06 |
| === mwhudson_ is now known as mwhudson | ||
| mwhudson | did i miss anything? | 20:07 |
| fullermd | Thunder. Lightning. Dancing girls. 3 pirouetting elephants. | 20:08 |
| mwhudson | cool | 20:08 |
| mwhudson | i guess i should set up a proxy one of these days | 20:09 |
| Prodoc | anyone available to make a small change to the bazaar user-guide so I don't have to get the source first and create a patch and stuff? | 20:19 |
| LarstiQ | Prodoc: sure | 20:20 |
| LarstiQ | with sufficient detailed suggestions I can actually do that :) | 20:21 |
| Prodoc | LarstiQ: the following sentence in http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#id41 doesn't really flow: 'On the other hand, Mary might want to merge into her branch the work Bill has done in his.'. The following makes more sense imho: 'On the other hand, Mary might want to merge the work Bill has done in his branch into her branch.' | 20:22 |
| LarstiQ | hmm | 20:23 |
| Prodoc | nitpicky I know ;-) | 20:23 |
| Prodoc | I had to read it over 3x | 20:23 |
| LarstiQ | I actually prefer the first sentence. | 20:24 |
| LarstiQ | but I'm not a native speaker, and I know my mind sometimes works rather strangely | 20:24 |
| Prodoc | or leave out 'in his branch' in the suggested sentence | 20:24 |
| jelmer | http://bundlebuggy.vernstok.nl/bzr-gtk/rss?selected=pending&unreviewed=n | 20:24 |
| Prodoc | that would make: 'On the other hand, Mary might want to merge the work Bill has done into her branch.', a lot clearer imo | 20:26 |
| abentley | jelmer: Cool. | 20:29 |
| abentley | jelmer: But I won't be able to put it on the main BB instance, because that query is really hard on the DB. | 20:30 |
| jelmer | abentley: it should be the same query as for the index page | 20:30 |
| abentley | jelmer: Yes. The index page is really hard on the DB. | 20:31 |
| jelmer | ouch :-( | 20:31 |
| abentley | Yeah. | 20:31 |
| abentley | Mainly because that box is underpowered, I think. | 20:31 |
| abentley | It runs at a decent speed on my 3-year-old laptop. | 20:32 |
| abentley | The first entry produces a parse error for me: XML Parsing Error: not well-formed | 20:32 |
| abentley | Location: file:/// | 20:32 |
| abentley | Line Number 60, Column 7: | 20:32 |
| LarstiQ | what box is it running on? | 20:32 |
| abentley | It runs on aaronbentley.com, which is a virtual machine hosted by unixshell | 20:33 |
| jam | abentley: I believe poolie discussed getting it hosted by Canonical servers, has anything come of that? | 21:00 |
| jam | I know one concern is just getting enough admin resources for a Canonical machine | 21:01 |
| jam | They like to lock the machines down pretty tight | 21:01 |
| abentley | jam: more recently, we've been talking about using a different host. | 21:01 |
| abentley | poolie was just talking to me about it. | 21:01 |
| mtaylor | hey guys | 21:14 |
| mtaylor | in a post-push hook | 21:14 |
| mtaylor | is there any way to get ahold of the revnos that the revisions will be in the remote tree? | 21:14 |
| poolie | jam, i think it's just you and me to talk today, as spiv is in canada and igc is on leave | 21:15 |
| LarstiQ | is Rob doing ok? | 21:16 |
| poolie | in what way? | 21:16 |
| poolie | he seemed ok yesterday | 21:16 |
| LarstiQ | poolie: he wasn't too well the last days I saw him | 21:16 |
| poolie | oh right | 21:17 |
| poolie | i think he was mostly over it by the time we left | 21:17 |
| poolie | though i am feeling a bit sick myself today | 21:17 |
| LarstiQ | poolie: ai, beterschap | 21:18 |
| lifeless | moin | 21:36 |
| james_w | hi lifeless. | 21:36 |
| james_w | are you feeling better now? | 21:36 |
| lifeless | comes and goes a bit | 21:36 |
| Stavros | hello | 21:37 |
| lifeless | may head up to doctor later today and get a considered opinion | 21:37 |
| lifeless | hi Stavros | 21:37 |
| Stavros | i would like to create a setup where the live server automatically updates its working tree with any revision tagged "release", is this possible? | 21:37 |
| lifeless | yes; it will need a cronscript at this point, or a client side hook | 21:38 |
| Stavros | aha, well, since it has to pull from another repo, i'm thinking cronscript | 21:39 |
| Stavros | but how can i read the tag? | 21:39 |
| james_w | Stavros: does "bzr tags" help? | 21:41 |
| Stavros | not really, i need to do it programmatically | 21:42 |
| Stavros | i'd probably need a cronjob to pull at regular intervals and a hook to update the tree on release/restart apache? | 21:42 |
| jam | Stavros: are you doing it in shell, or in python? | 21:42 |
| jam | Stavros: because you could just do "bzr pull -r tag:release" from shell | 21:43 |
| jam | From python it would be more: | 21:43 |
| Stavros | jam: probably in python, because i need tags preserved (i'm not entirely sure how tags work), so the tags would be something like "Release 1.2.2" | 21:43 |
| jam | tag_revision = branch.tags.lookup_tag('release') | 21:44 |
| jam | Ah, you want Release XXX not just "Release" | 21:44 |
| Stavros | yes, something like that | 21:44 |
| Stavros | it's the same thing in python, that's why i didn't mention it | 21:44 |
| jam | So in that case, you could do: | 21:44 |
| jam | b = bzrlib.branch.Branch.open('remote_location') | 21:44 |
| Stavros | actually i should read up on bzr scripting because i have no idea how to do this | 21:45 |
| jam | tags = b.tags.get_tag_dict() | 21:45 |
| jam | for name in tags: | 21:45 |
| jam | if name.lower().startswith('release'): | 21:45 |
| jam | .. | 21:45 |
| jam | it sort of depends how you want to decide to use 1.2.2 over 1.2.1 | 21:45 |
| jam | etc | 21:45 |
| Stavros | i shouldn't have any problems with the actual script, i just want to know where to put it/how you go about writing hooks/etc | 21:46 |
| Stavros | is there a webpage that explains that stuff? | 21:46 |
| Stavros | is it this? http://bazaar-vcs.org/WritingPlugins | 21:46 |
| james_w | Stavros: that has some of it. I don't know if it will have all that you need though. Feel free to ask questions in here if not. | 21:47 |
| Stavros | will do, thanks | 21:48 |
| frsk | 7w 21 | 21:49 |
| frsk | Gah. | 21:49 |
| Stavros | wow, you can version your bzr plugins with bzr | 21:59 |
| Stavros | i think my head just exploded | 21:59 |
| Stavros | are bzr tags just text that is associated with a release number? | 22:00 |
| jam | Stavros: tags are just a name associated with a revision_id | 22:02 |
| Stavros | err yes, why do i keep calling revisions releases, i'll never know | 22:02 |
| Stavros | that is quite elegant | 22:02 |
| jam | And yes, all of my tags are bzr branches in ~/.bazaar/plugins | 22:02 |
| Stavros | and tags are unique? | 22:02 |
| Stavros | jam: what was that? | 22:02 |
| jam | tags are not universally unique | 22:02 |
| Stavros | hmm | 22:02 |
| jam | sorry, all of my plugins are branches .... | 22:02 |
| jam | not tags :) | 22:02 |
| Stavros | ah | 22:02 |
| Stavros | tags aren't unique? how does that work then? | 22:03 |
| james_w | they are unique to a branch, and a merge may cause a tag conflict that you have to resolve. | 22:03 |
| Stavros | oh | 22:04 |
| Stavros | well, a branch is as universal as it gets, isn't it | 22:04 |
| james_w | so if I tag one revision as "release 1.1" and you tag a different one as "release 1.1" then there needs to be intervention when we merge to say who was right. | 22:04 |
| Stavros | true | 22:04 |
| huslu | can someone kindly tell me what's the difference between --no-trees and the default in init-repo command? won't they both start out with emptry directory? | 22:24 |
| LarstiQ | huslu: they will. The difference is what happens when you bzr init/branch branches into it | 22:25 |
| huslu | LarstiQ: thanks but what is the difference when you branch (or push?) into it (with when init-repo was started with --no-trees) | 22:27 |
| LarstiQ | huslu: with --no-trees you'll just get a branch but no working tree. Ie, branchname/.bzr/ but no other files under branchname/ | 22:28 |
| LarstiQ | huslu: which goes nicely with having a lightweight checkout of that branch somewhere else on your filesystem where you do actual development | 22:28 |
| huslu | LarstiQ: k, so if i understand correctly, all the --no-trees does is, keeps the revision history in a different place? | 22:32 |
| poolie | lifeless: can i call? | 22:32 |
| LarstiQ | huslu: no, the revision history is kept in the same place. The only difference is to wether create a working tree at the same place as the branch or not. | 22:33 |
| LarstiQ | huslu: but you can see for yourself, bzr init-repo repo; bzr branch lp:bzr-gtk repo/gtk; bzr init-repo --no-trees repo-no-trees; bzr branch repo/gtk repo-no-trees/gtk | 22:34 |
| LarstiQ | huslu: and then ls repo/gtk repo-no-trees/gtk | 22:34 |
| Stavros | wait, to create a hook all i need to do is write a function and register it? | 22:34 |
| huslu | LarstiQ: right, so the difference is that the files are not in the repo-no-trees directory? | 22:35 |
| LarstiQ | huslu: that sentence is a bit amibguous. All the files needed to reconstruct a working tree are in both repositories | 22:37 |
| LarstiQ | huslu: you can get the same effect on repo-no-trees by doing: cd repo-no-trees/gtk; bzr checkout . | 22:37 |
| LarstiQ | huslu: but the default will still be to create tree-less branches then | 22:37 |
| LarstiQ | huslu: the other way around, cd repo/gtk; bzr remove-tree | 22:38 |
| Stavros | does a "pull" update the working tree if it had no local changes? | 22:38 |
| LarstiQ | Stavros: yes, also if it did. | 22:38 |
| LarstiQ | Stavros: that is, non-committed local changes | 22:38 |
| Stavros | LarstiQ: it just overwrites the changes? | 22:38 |
| Stavros | that can't be right | 22:38 |
| LarstiQ | Stavros: if you have diverging commits, it will tell you it has diverged | 22:39 |
| Stavros | ah | 22:39 |
| LarstiQ | Stavros: no, it merges the content | 22:39 |
| huslu | LarstiQ: ok, that helps, now, can you help me to see the light when or why is it beneficial to not to store the working tree there? | 22:39 |
| Stavros | how do i make it so it doesn't update the wc? | 22:39 |
| LarstiQ | huslu: each working tree consumes diskspace, you don't always need them | 22:39 |
| LarstiQ | Stavros: I'd have to check to be sure, but I'd think invoking the method on Branch instead of WorkingTree | 22:40 |
| LarstiQ | huslu: or for example if you use a workflow where you `bzr switch` between branches but have only 1 working tree | 22:41 |
| Stavros | hmm | 22:41 |
| huslu | LarstiQ: ok, i haven't gotten around to that part yet. but your explanation made things more clear, i'll keep learning. | 22:42 |
| Stavros | hmm, well, this doesn't help my plan for the self-updating servers... | 22:42 |
| LarstiQ | Stavros: alternatively, you could decouple the branch and the checkout, update the branch, and then update the working tree to the latest release tag | 22:42 |
| LarstiQ | huslu: np | 22:43 |
| Stavros | LarstiQ: you mean push to the branch> | 22:43 |
| Stavros | ? | 22:43 |
| LarstiQ | Stavros: no, pull | 22:43 |
| Stavros | how would i do it so the wc wasn't updated, though? | 22:44 |
| LarstiQ | Stavros: I'd go with a branch without wc, and the wc in a different location | 22:44 |
| Stavros | ah | 22:44 |
| Stavros | not very elegant, though | 22:44 |
| LarstiQ | or more elegant, depending on how you look at it :) | 22:45 |
| Stavros | well, the more elegant solution would be one that didn't require me to keep the repo and the files in separate locations and copy between them :p | 22:45 |
| LarstiQ | Stavros: or if you could go without local changes, pull, and then revert to the latest release tag | 22:45 |
| LarstiQ | Stavros: copy? Eh, no | 22:45 |
| LarstiQ | Stavros: branch in one location, lightweight checkout in another | 22:46 |
| Stavros | oh | 22:46 |
| poolie | does anyone know if python-glade2 2.8.6 will be enough for bzr-gtk | 22:46 |
| Stavros | hmm, what was that other solution? pull and revert? | 22:46 |
| poolie | re bug 200366 | 22:46 |
| Stavros | actually that should work | 22:46 |
| fullermd | Urg. Not very well. | 22:46 |
| LarstiQ | Stavros: the drawback of that is that is going to do more writes to disk than needed | 22:47 |
| LarstiQ | fullermd: to poolie's question or Stavros comment? | 22:47 |
| fullermd | The latter. | 22:47 |
| Stavros | LarstiQ: it doesn't matter much, it's not that many files | 22:47 |
| Stavros | fullermd: what would you recommend? | 22:47 |
| mamato | hmm, any way to use bzr (for commits, reverts, etc) while using 'bzr gdiff'? | 22:47 |
| Stavros | mamato: does it lock? | 22:48 |
| fullermd | I haven't been much paying attention. But you'll work yourself into an unpleasant corner using rever tlike that. | 22:48 |
| mamato | yep! not sure why... | 22:48 |
| Stavros | fullermd: the server doesn't have any local changes, and this is the best solution so far... | 22:48 |
| Stavros | the absolute best would be if there was a "bzr pull --no-update" option | 22:48 |
| Stavros | so it didn't update the working copy | 22:48 |
| LarstiQ | fullermd: the use case is only updating the working tree to revisions tagged with a release | 22:48 |
| Stavros | and then i manually reverted to the latest revision whenever i wanted | 22:49 |
| fullermd | How do you define a 'release'? | 22:49 |
| mamato | Stavros: it's not like gdiff allows you to do much :S | 22:49 |
| LarstiQ | Stavros: well, in my mind that is exactly served by having branch and tree not co-located | 22:49 |
| Stavros | LarstiQ: hmm, i should read up on a lightweight checkout | 22:49 |
| Stavros | fullermd: a release is the well-tested code | 22:49 |
| Stavros | that should run on production | 22:50 |
| Stavros | all other commits should run on dev | 22:50 |
| fullermd | I know, but what in bzr terms makes the release? A sliding tag? Somebody updating a revno in a control file? | 22:50 |
| Stavros | fullermd: oh, a tag | 22:50 |
| Stavros | not sliding, just tag "release x.x.x" | 22:50 |
| Stavros | or even sliding, same thing | 22:50 |
| fullermd | The problem is that `revert -r` is not `update -r`; you'll wind up in Conflict City every time you pull. | 22:50 |
| Stavros | oh | 22:50 |
| Stavros | that won't do, then | 22:50 |
| fullermd | I'd just make a sliding LATEST_RELEASE tag, and pull -rtag:LATEST_RELEASE. | 22:51 |
| Stavros | why would it conflict, though? there are no local changes | 22:51 |
| fullermd | There are, though. revert makes local changes. | 22:51 |
| Stavros | ah | 22:51 |
| fullermd | (you may need pull --overwrite because of the rough corners of tags) | 22:51 |
| LarstiQ | fullermd: something I wanted to ask early, does it do the lookup of tag:LATEST_RELEASE in the parent branch? | 22:51 |
| Stavros | i would like to be able to track releases, so i'm not very partial to the sliding tag idea | 22:51 |
| fullermd | LarstiQ: Yah. pull -rwhatever refers to revs in the branch pulled from. | 22:51 |
| fullermd | Well, the idea is that you update the sliding tag to point at a release when you make it and are sure it's ready; that way it all Just Happens. | 22:52 |
| LarstiQ | fullermd: oh, doh | 22:52 |
| fullermd | If you don't slide a tag, you have to go update the tag in the pull'ing script every release, since it needs to go somewhere different. | 22:52 |
| Stavros | yes, but i've had times when i needed to revert to the previous release | 22:52 |
| Stavros | fullermd: i was thinking of a plugin that parsed it and selected the latest revision tagged with "release" | 22:53 |
| dato | fullermd: `bzr tags --sort=time | tail -1 ` ;) | 22:53 |
| ubotu | Launchpad bug 200366 in bzr "Ubuntu package bzr-gtk for Dapper depends on package not available for Dapper." [Medium,Confirmed] https://launchpad.net/bugs/200366 | 22:53 |
| Stavros | something like dato's | 22:53 |
| fullermd | Then you'd just slide the tag back, and the pull'ing copy will follow next time it runs (with --overwrite in that case, definitely) | 22:53 |
| Stavros | fullermd: yes, but the problem is remembering where the tag was | 22:53 |
| fullermd | Who needs to remember? It was the same as rel_3_4, then rel_3_5, then rel_3_6, then OOPS 3.6 was horked up, move it back to rel_3_5 | 22:54 |
| Stavros | fullermd: that's not sliding, though | 22:54 |
| Stavros | or can you have multiple tags per release? | 22:54 |
| fullermd | Sure it is. You have defined tags for each release, *AND* a DEPLY_THIS_CODE tag pointing at whatever you want the server running at the moment. | 22:54 |
| Stavros | err, revision | 22:54 |
| Stavros | ah, THAT i like | 22:54 |
| fullermd | Sure. You could have a thousand tags pointing at one rev. | 22:54 |
| Stavros | great gret | 22:54 |
| fullermd | And you should, actually. I don't think anybody's done it, so we need a guinea pig ;> | 22:55 |
| Stavros | so i tag a rev in my local repo and push it to the main one | 22:55 |
| Stavros | haha, damn you | 22:55 |
| Stavros | then i do bzr pull -rtag:PRODUCTION ? | 22:55 |
| * fullermd nods. | 22:55 | |
| Stavros | aha, let me try that | 22:55 |
| fullermd | Probably need pull --overwrite; otherwise it won't step backward if you have to move the tag back. | 22:55 |
| Stavros | aha, okay | 22:55 |
| fullermd | (and it may not pull the tag quite right either, due to above) | 22:56 |
| Stavros | does "bzr tag tag1 tag2" tag with two tags, or tag with one tag with a space in it? | 22:56 |
| fullermd | I think it may give an error... | 22:57 |
| Stavros | aha | 22:57 |
| Stavros | also, are tags fully reversible? i can delete them without any trace, no? | 22:57 |
| fullermd | I'd do something like `bzr tag -r-1 RELEASE_3_5 ; bzr tag -rtag:RELEASE_3_5 PRODUCTION` | 22:57 |
| Stavros | why -r-1? | 22:58 |
| Stavros | oh | 22:58 |
| Stavros | i see, yes | 22:58 |
| fullermd | Well, or -rwhatever; find the rev to tag the release, then use the release tag to set the PRODUCTION tag. | 22:58 |
| Stavros | yes | 22:58 |
| fullermd | I _think_ pull --overwrite doesn't delete tags gone upstream. It should move moved ones, though. | 22:58 |
| mamato | is it possible to have bzr commit display the diffs in the bottom part of the file it has you edit for comment, where the list of files is? | 22:59 |
| fullermd | Tags got to that awkward state where they're plenty good enough for 90% of uses, and the other 10% isn't near the top of anybody's priority list :| | 22:59 |
| james_w | mamato: bzr commit --show-diff | 22:59 |
| mamato | hehe, nice! | 22:59 |
| Stavros | offtopic, does anyone use fish? | 23:00 |
| mamato | james_w argh... not available... i guess my bzr is too old :( | 23:01 |
| fullermd | Mmm... NEWS says it was in 0.91. That's a fair couple steps back now... | 23:01 |
| mamato | i use what ubuntu gave me (and it's up to date)... it's 0.90.0 :( | 23:02 |
| Stavros | it seems to be working | 23:02 |
| Stavros | mamato: yeah, ubuntu is a bit bacjk | 23:02 |
| Stavros | use the repository on the site | 23:03 |
| Stavros | fullermd: is there any way i could push to that server and have it detect if the PRODUCTION tag changed revisions and restart servers/etc? | 23:03 |
| Stavros | i mean, do all that on push instead of pull | 23:03 |
| fullermd | With push? I dunno... I s'pose you could parse the output at least, looking for an 'update' (or whatever it says) keyword. Not sure if the exit code says anything. | 23:04 |
| james_w | Stavros: the normal way to do this would be using branches I think. However that may not help you. | 23:04 |
| Stavros | hmm | 23:05 |
| Stavros | so the easiest way would be to write a crontab to pull every x minutes? | 23:05 |
| fullermd | Yeah, that's how I'd do it. | 23:05 |
| fullermd | (well, it's not of course, but it's how I'd do it given you general setup ;) | 23:05 |
| Stavros | how would you do it? | 23:05 |
| Stavros | with another setup? | 23:05 |
| fullermd | Well, I do all my deployals via install(1) :p | 23:06 |
| Stavros | pff :p | 23:07 |
| mamato | rrrrrhhh... newer bzr requires newer libc and python-central... | 23:07 |
| mamato | oops... nevermind | 23:09 |
| mamato | any way to have --show-diff be the default? | 23:18 |
| mamato | aliases won't even work transparently since option has to come after command :( | 23:19 |
| Peng | defaults? | 23:20 |
| Peng | Err, I dunno. That's an hg thing. :P | 23:21 |
| Stavros | heathen! | 23:22 |
| mamato | hmm... should have looked more carefully at hg before choosing bzr i guess ;) | 23:22 |
| Stavros | sacrilege | 23:22 |
| Stavros | actually i think they're more or less the same | 23:23 |
| Stavros | bzr has better merging | 23:23 |
| LarstiQ | Peng: what is a hg thing? | 23:23 |
| fullermd | Huh? Why don't aliases work? | 23:24 |
| mamato | well you cant alias it as 'bzr commit' | 23:29 |
| Peng | I'm pretty sure you can. | 23:30 |
| fullermd | Sure you can. | 23:30 |
| fullermd | Wait. bzr aliases, not shell aliases. | 23:30 |
| james_w | mamato: are you referring to shell aliases? did you realise that bzr itself supports aliases? | 23:30 |
| mamato | was talking about shell aliases | 23:31 |
| james_w | mamato: http://bazaar-vcs.org/CommandAliases | 23:32 |
| Peng | Oh. | 23:32 |
| Peng | Bazaar aliases can do this fine. I just tested it. | 23:32 |
| james_w | yeah, I have that alias set up. | 23:32 |
| mamato | nice! so bzr does allow default options! | 23:33 |
| james_w | And it automatically supports inverse options, so that you don't have to worry about doing unalias to get around any issues. | 23:34 |
| james_w | for instance if you alias "commit = commit --strict" this won't let you commit with unknown files in your working tree. However if you want to do it once for some reason you can run "bzr commit --no-strict" which expands to "bzr commit --strict --no-strict" and the latter takes precedence. | 23:35 |
| mamato | while i'm at it, is it possible to add colors or bolds to diff? (w/o launching gtk) | 23:39 |
| Odd_Bloke | mamato: The 'cdiff' command in bzrtools adds colour. | 23:43 |
| mamato | thx! | 23:45 |
| mamato | just in case, you got a trick to colorize the --show-diff of commit in vim too?! | 23:49 |
| james_w | mamato: a vim plugin to do that may be quite straightforward, but I haven't heard of one yet. | 23:52 |
| mamato | hehe oki | 23:53 |
| jelmer | I think I saw one being posted on Google code | 23:53 |
| jelmer | a generic one for vcs'es | 23:53 |
| mamato | one last thing then... a replacement for less which would work with colorized output? | 23:54 |
| james_w | jelmer: vcscommand? | 23:54 |
| jelmer | james_w: yeah, probably | 23:54 |
| jelmer | somebody posted a patch that added bzr support for it | 23:55 |
| james_w | jelmer: yeah, I think that provides :vcs commit or similar, but it may have what mamato wants. | 23:55 |
| jelmer | yeah, it allows you to run vimdiff between the base of the working tree and the working tree | 23:56 |
| Stavros | is there a switch to commit the wc just like it is, even if it's a few revisions back or whatever? | 23:56 |
| james_w | mamato: bzr cdiff | less -R do what you want? | 23:56 |
| mamato | héhé, found my 'less -R' for now | 23:56 |
| mamato | yep, thx! | 23:56 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!
