/srv/irclogs.ubuntu.com/2008/01/28/#bzr.txt

Verterokmoin00:51
lifelessabentley: walked in the door this morning01:58
abentleyI got back in Toronto last night.01:59
* Odd_Bloke smells the beginnings of a lifeless/abentley duet.02:02
abentleyOdd_Bloke: I actually do write songs.  If we're doing for an ABAB rhyme scheme, some possible rhymes are "warning", "scorning" and "a-borning"02:04
lifelessabentley: I think yawning02:06
brink_Time to turn off the light.02:16
igcbbiab03:29
=== mw|out is now known as mw
* igc lunch03:51
=== mw is now known as mw|out
abentleyjelmer: IMO, hard links are not a problem, even if the files they refer to are in the same directory.  Operations that change files through TreeTransform always perform a safe replacement-- they don't overwrite file contents.04:48
abentleySo they automatically break hard links when the linked files are modified.04:52
igcbbl04:59
=== weigon_ is now known as weigon
=== pbor|out is now known as pbor
=== doko_ is now known as doko
piemhi all09:33
piemhow should i move a repository from my laptop to my server?09:33
snodwith push09:36
snodthe exact protocol depends how you can connect to your server (sftp, ssh, ftp)09:37
piemsnod: so i should bzr push foo://, then rm local repo, and then bzr checkout foo:// ?09:39
snodöhm09:39
snodwhy do you want do delete your local repo?09:40
piemsnod: because i want to move it, as in cp + rm :-)09:40
piemif i don't move the old branch away, i don't know how to merge from the updated branch i pushed earlier10:08
lifeless'bzr merge'10:12
snodis it possible with bzr, to substitute some variables in a file you're commiting with the the revno for example?11:06
Kinnisonhttps://blueprints.launchpad.net/bzr/+spec/bzr-keyword-expansion11:08
snodthank you11:09
piemKinnison!! :)11:10
* piem hugs Kinnison11:10
* Kinnison hugs piem. Ça va?11:10
piembien! and you?11:11
Kinnisonpas mal.11:12
quik__hey folks11:16
quik__if I bzr push to an sftp location11:16
* rjek awaits the rest of the question :)11:17
quik__I try to checkout from the location to grab the code ... I get "bzr: ERROR: Not a branch: "11:18
quik__how can I pull a copy of my code, similar to svn export in subversion?11:20
quik__and it puts bzr: ERROR: Not a branch: /home/ben/test/sftp:/myserver.com/projects/projectname11:21
quik__yet my command was11:21
quik__bzr checkout  -r 1 sftp://myserver.com/projects/projectname11:22
quik__rjek: any ideas?11:22
snodi think the path is wrong11:23
quik__I copied it from where I pushed the repo11:23
* rjek is interested in why there's sftp:/myserver in the path in the error.11:24
rjekWhich is entirely wrong.11:24
quik__how else would I check it out11:24
quik__?11:24
datois paramiko installed?11:25
quik__no.11:25
datoinstall it :)11:25
datoyou need it to use sftp11:25
quik__I installed bzr with apt-get11:25
snodbut how could you push it to a sftp location without the lib?11:25
quik__I guess it would help if it had it as part of the package11:25
datosnod: maybe he pushed from a different machine11:26
quik__correc11:26
quik__correct*11:26
quik__after installing paramiko I got "bzr: ERROR: unknown branch format: Bazaar Branch Format 6 (bzr 0.15)"11:28
quik__so I guess I have different versions..11:28
quik__that really blows11:28
datoyou have < 0.15?11:28
quik__Bazaar (bzr) 0.92.0 and bzr (bazaar-ng) 0.8.211:29
quik__between the two system11:29
dato0.8 is very old11:29
quik__its ubuntu packages11:30
datobut if you really can't upgrade11:30
quik__I could install from source I guess11:30
snodna11:34
quik__snod: how can I skip the silly error?11:35
Ngfwiw, the bazaar website has packages for ubuntu of more recent versions11:36
snodquik__: triy one of these https://launchpad.net/~bzr/+archive/11:37
snodthe repositories listed on the mainpage don't have the latest version11:38
snod(for ubuntu)11:38
snodthere is backport for debian stable on backports too11:38
quik__yey11:39
quik__that worked.11:39
quik__I updated it to 1.0-rc111:39
miklWhat is the best web-frontend for bzr? Still loggerhead?12:13
=== kiko-afk is now known as kiko
=== lamont` is now known as lamont
=== Niklas_TechWorld is now known as nandersson
=== nandersson is now known as andersson
ubotuNew bug: #161082 in bzr-svn "very hard to get going on windows" [Medium,In progress] https://launchpad.net/bugs/16108213:40
encompassis there some documentation on how to setup your work to be ready to packaged?14:19
encompasssabdfl: greets14:24
sabdflhey encompass14:25
encompassHave you seen my latest work?  http://launchpad.net/memaker14:29
encompassIt's going to be a part of macslows brilliance14:29
igcnight all14:29
encompassigc: gn14:30
=== mw|out is now known as mw
encompassI want to build packages of memaker, and ubuntu-motu told me there was a way to easily beuild packages with bzr...16:06
encompassthis sounds interesting, how is this done?16:06
encompassThe reason I ask is that we have no packagers and it would be nice if we did, or had some way of doing it easily ourselves16:08
jelmerencompass: have a look at the bzr-buildpackage package16:14
jelmersorry, bzr-builddeb16:14
encompassjelmer: thanks... that is a start :D16:20
mtaylorencompass: bzr-builddeb is the best thing in the world16:35
mtaylorabentley: you're running hardy, right? do you get segfaults when trying to run /lib/cpp ?16:46
abentleymtaylor: I'm running Gutsy.16:47
mtayloroh16:47
mtaylorhrm16:47
* mtaylor is going crazy16:47
anderssonencompass: Make deb-template with command dh_make (Think you find it in package devscripts) Make the package "CDBS" = Common Debian Build System. Then you're on your way17:08
andersson+ have a look at how to make a "native" package with bzr-builddeb as mtaylor said17:08
Nice27hi17:16
slangasekis it ok to ask questions here about bzr best practices wrt packaging branches on launchpad.net?17:19
* slangasek skips a pebble across the placid IRC channel17:22
jelmerI think so, though launchpad-related things may be more appropriate in #launchpad17:22
datooh, slangasek, heh17:25
slangasekjelmer: well, my question is in regards to https://wiki.ubuntu.com/BzrMaintainerHowto, which seems to somewhat punt on the question of using bzr-svn for registering packaging-only bzr branches17:25
slangasekI'm unsure whether this is worth the effort, vs. just maintaining an ubuntu branch if I don't expect to be merging much from debian (it's for a package that the debian maintainers consider obsolete)17:26
* jelmer has a look at that wiki page17:27
jelmerslangasek: It shouldn't be much of an effort to start with a branch imported from svn17:28
slangasekwell, ok17:28
jelmerI don't see why you would necessarily have to register the upstream debian branch17:28
slangasekbut if I wasn't working with the packaging-only svn branch, I guess I would probably do a branch for the full source tree?17:29
jelmeryou can just "bzr branch svn://url-to-debian-package/ ubuntu"; cd ubuntu; hackety-hack; bzr push lp:...17:29
slangasekright - but if I'm going to do that, maybe it's better to branch from the upstream source, do a one-time add of all the debian packaging, and bzr push?17:29
slangasek(I'm increasingly disenchanted with packaging-only branches myself)17:30
jelmerslangasek: There doesn't appear to be a consensus about whether to use packaging only bzr branches17:30
* jelmer prefers the full tree, but I know various people here who use packaging-only branches17:30
slangasekjelmer: ok, setting aside the consensus -- are there good /tools/ for working with packaging-only branches? :)17:30
slangaseki.e., how does one handle patch systems within a packaging-only branch in a non-suck manner?17:31
jelmerwell, you can use dpatch or quilt like you're used to17:31
slangasekyes, but to actually manipulate the patches within, the parent dir of your packaging branch needs to be a source tree17:32
jelmerYou can rename the branch to "debian" and put it in the source tree and manipulate the patches that way17:33
jelmerI've never done that though, this is one of the reasons why full source trees work better17:33
slangasekright - I've done that in the past, I think it sucks because it means moving my checkout around every time I'm unpacking a new upstream version17:34
slangasek(hmm, not that there's likely to be a new upstream version of this package either, but still :)17:34
jelmeranother way to use a full-source bzr branch and be able to merge from the debian packaging-only svn branch is to use "bzr join"17:35
slangaseko-ho17:36
slangasekthat sounds like what I was just about to ask for :)17:36
slangasekso then I can bzr branch the upstream, bzr branch the debian subdir, and bzr join?17:37
jelmeryep, that's the idea17:38
slangasekawesome17:38
slangasekyes, /exactly/ what I was going to ask for :-)17:38
jelmerand "bzr merge <debian-svn-url>" will still work then and do the right thing17:38
jelmeryou'll have to use the rich-root(-pack) format for this to work17:39
slangasekbzr branch seems to (reasonably) decline to branch from the debian subdir though17:39
slangasekbzr: ERROR: /grub/trunk/debian is not a valid Subversion branch path.17:39
jelmertry removing ~/.bazaar/subversion.conf and trying again17:39
jelmerthat'll be fixed in bzr-svn 0.4.717:40
slangasekcool, seems to be working17:40
jelmerabentley: Hmm, I just stated that merging will work here but I'm doubting now. Will it?17:41
abentleyjelmer: haven't read the context.17:42
jelmerabentley: merging from a branch with a root id that is not a root id in the branch that we're merging into17:42
jelmerabentley: but is present (as regular directory)17:43
abentleyThat should work just fine.17:43
jelmersweet17:43
slangasekok, the join fails because of a wrong repo format...  bzr upgrade says I'm at the most recent... how do I get a tree that's dirstate-with-subtree as required by 'join'?17:48
datoupgrade --rich-root or --rich-root-pack (if you're on pack-0.92) would be best17:49
datoupgrade --dirstate-with-subtree is the other option, but it's experimental and shouldn't be needed, as per what jelmer said17:49
slangasekworks, cheers17:50
dato(nb, rich-root requires >= 1.0, -subtree >= 0.15)17:50
=== Michael_Kaiser is now known as Michael
jelmertime to make rich-root-pack the default..17:59
abentleyIt's a bit disturbing to see people using join, since that's a hidden command.18:24
jelmerabentley: I thought join was considered stable now18:24
jelmerabentley: and only join --reference was still experimental?18:25
abentleyJoin without --reference is the only thing that's experimental.18:25
jelmerbut join --reference is only usable with with-subtree formats, no?18:26
abentleyBut I haven't made --reference hidden, so the whole command's hidden.18:26
abentleyjelmer: true, it's only usable with -subtree.18:27
jelmerabentley: is there a negative missing in your previous line?18:27
jelmers/without/with/ I mean18:27
abentleyjelmer: no, but "it" refers to "--reference"18:28
mtaylorif I have a repo with tons of branches18:28
mtaylorand I want to upgrade to rich-root-pack18:28
mtaylordo I need to upgrade each branch, or will upgrading the repo do it?18:28
jelmerabentley: so which bit became stable when you added the rich-root format?18:29
datomtaylor: just the repo, for this one upgrade18:29
jelmerabentley: I vaguely recall there as some nested-tree feature that became non-experimental18:30
abentleyjelmer: join-by-value has been stable since before I implemented subtree formats.18:30
abentleyjoin-by-reference is still experimental.18:30
mtaylordato: awesome. thanks18:30
jelmerabentley: Ahh, so there was actually a negative missing18:31
jelmerabentley: thanks18:31
abentleyA negative missing from what?18:32
jelmer"19:25 <abentley> Join without --reference is the only thing that's experimental."18:32
abentleyOh, yes, that should be "with"18:32
jelmerabentley: If we would hide --reference, would you be ok with making "bzr join" visible?18:33
abentleyBut when you mentioned my "previous line", I thought you meant 01:26:50 PM) (abentley: jelmer: true, it's only usable with -subtree.18:33
abentleyjelmer: sure18:33
jelmerahh, sorry18:33
jelmerI think slangasek's use case is one of the areas where by-value nested trees can be very useful18:33
jelmers/areas/examples/18:34
abentleyI haven't seen his use case, but I can well imagine there are uses for join.18:35
abentleyIt's just upsetting when people are just randomly using things you've hid to protect them.18:36
jelmersorry, I didn't know join was still hidden18:36
jelmerI'll see if I make that patch to hide --reference18:36
abentleyCool.  I'm not sure whether Option supports a hidden flag.18:37
abentleyBtw, the "split" command is not hidden now.  That may be what you were thinking of.18:38
jelmerah - yep, that may be what confused me18:38
jelmerI tend to think of them as complementing each other18:39
RainCTHi19:01
RainCTI need a fast way to know what the current revision of a local branch is (for a script). What do you recommend?19:02
RainCTcat .bzr/branch/last-revision   ?19:04
aidoshi everyone19:04
aidosi'm currently trying to switch from svn to bazaar, and i have a couple of questions19:05
aidosany bzr gurus around?19:06
jelmeraidos: hi19:06
aidoshi jelmer. can i bother you then? :)19:06
jelmerRainCT: "bzr revno" ?19:07
jelmeraidos: just ask your question, I'm sure there's somebody who can answer19:07
aidosjelmer: ok19:07
RainCTjelmer: Ah :). But cat + cut is faster, is there anything I should know that makes 'bzr revno' better?19:08
aidosso here's one of my main problem: I 've set up a bazaar repo with different project at the root, each of them with it's own /dev /trunk /merge as suggested in the bazaar documentation19:08
jelmerRainCT: it works across formats19:08
datoRainCT: it's resilient against branch format changes19:08
aidoshow can i retrieve all the trunks of all the projects without having to do a branch for each project ? like a "bzr multi-branch"19:09
RainCTjelmer, dato: okay, thanks :)19:11
aidosbecause in SVN i had all these projects in the same repo, so a svn checkout got me all the sources I needed. but i figured it 'll be pretty stupid and broken to put all the projects in the same branch in bazaar, but now i kinda really annoyed....19:11
aidossorry for the long reads :)19:12
jelmeraidos: I don't think there's any way to do that yet19:12
jelmerI've actually complained about that as well19:12
RainCTaidos: if you use Launchpad and Ubuntu, if all the branches are owned by the same team, I think there's a a script in package ubuntu-dev-tools that does this.. I'm not sure thought.. let me check19:13
aidossadly my projet is not open source, so launchpad is not a option :)19:13
RainCTah :(19:13
jelmerRainCT: that sounds interesting19:14
aidosyeah. but thanks. I guess i'll write my own script then19:14
aidosand is nested branch an option?19:14
aidosnested branchES*19:14
RainCTjelmer: it's there. get-branches (by dholbach) :)19:15
jelmeraidos: by-reference nested trees are still experimental19:16
jelmerRainCT: hmm, unfortunately I'm on Debian..19:16
RainCTjelmer: http://bazaar.launchpad.net/~ubuntu-dev/ubuntu-dev-tools/trunk/19:17
aidosjelmer: have you come up with any other tricks to solve that?19:19
jelmeraidos: you can use something like rsync19:19
lifelessmoin19:20
aidosjelmer: true. hadn't thought of that.19:21
aidosjelmer: or even simply sftp ? since that's what i'm using with bazaar.19:22
dysingerneed to ask a question about shared repositories.  If I create one and then check some branches out into it and etc....  Should I do --no-trees or is that something for a shared repo on a server like git clone --bare ?19:24
dysingerI think that's right19:25
asabildysinger: yes19:25
dysingerok19:25
asabilthe --no-trees is to be used on servers willing to save some disk space, by not having any tree in the repository19:25
dysingerSo If I am going to push multiple sibling branches to a server via sftp, should I create a shared repo --no-trees on the server for them to leverage pack-sharing ?19:26
jelmerRainCT: the default ubuntu-dev-tools branch has syntax errors in get-branches19:26
RainCTreally? xD19:27
* RainCT never tried it..19:27
asabildysinger: a shared repo yes, --no-trees should be ok to reduce the disk space usage19:29
dysingerkthx19:29
asabildysinger: also maybe you want to push over bzr+ssh:// instead of sftp://19:29
dysingerok19:29
dysingerAs long as I have bzr on the server ssh is more efficient that way ?19:29
asabilthat will require you to  install bzr on the server though, but will make the push damn faster19:30
dysingerisn't ssh:// the same ?19:30
dysinger(same as bzr+ssh:// ?)19:30
asabilnot sure if ssh:// exists19:30
dysingerok maybe I am thinking of git19:30
lifelesswe don't support 'ssh://' urls, just bzr+ssh19:31
lifelessssh:// indicates you want a terminal19:31
lifelesswhereas we want a bzr process on the other end19:31
dysingerok19:31
jelmerand it would be very confusing since we support bzr+ssh:// and svn+ssh:// :-)19:32
jelmerone day also git+ssh:// hopefully..19:32
asabilthat's something I always liked about bzr : true extensibility19:32
dysingerI like the extensibility too - that and the windows compat are +2 for me - I use mac and linux but there is always one person on windows on my team.19:34
dysingerJelmer - did you enter the bug on subversion for the certificate acceptance problem we found with subversion 1.5 / bzr-svn stable ?19:35
dysingerCould you send me the link so I can watch it?19:35
dysingerI am using a hacked bzr-svn stable with the provider commented out of transport.py19:35
dysingerIt seems to work but I still get asked for authentication everytime even though "svn info xxxx" has already cached it (FYI)19:36
dysingerAnother common problem I have been seeing is that some svn projects have a structure where the trunk is on trunk/projectname but then the branches are just named branches/this-or-that and tags tags/some-version.   It seems bzr-svn thinks trunk/project name is a single-trunk and can't deal with the tags or branches.  If I change it to be branching-scheme trunk then the branches and tags work but I cant update trunk ever again with it like tha19:40
jelmerdysinger: I've just fixed that in the 0.4 branch19:41
dysingerthe provider thing?19:41
jelmerdysinger: No, the last problem you mentioned19:41
dysingerah - do I need to change my subversion.conf ?19:42
jelmerdysinger: It'll allow you to branch in those situations but won't allow merging between those branches unless you explicitly set the branching scheme19:42
jelmerI haven't looked into the SSL certificate bug yet19:43
dysingerokthx19:43
lifelessjam: http://unicode.org/notes/tn5/#FCD may interest you19:52
lifelessjam: http://osdir.com/ml/network.gnutella.limewire.core.devel/2003-01/msg00000.html claims that FCD is what OS X use, all claims of NFD aside19:52
jamlifeless: thanks for the pointer, but I'm about 90% sure that Mac isn't FCD21:20
jamSpecifically, the FCD link claims that:21:20
jamA-ring          (A)(ring)          NFC, FCD21:20
jamu'\xb5' is valid NFC and FCD, but I'm sure it isn't valid on Mac21:20
foomhfs+ hardcodes a table21:25
foomsee http://developer.apple.com/technotes/tn/tn1150.html#UnicodeSubtleties21:25
dysingerIs there a gitk or tig -like program for bzr to review in detail each commit with a diff window?22:08
jelmerdysinger: bzr viz ?22:10
bialixjam: help needed22:14
lifelesshi bialix22:14
bialixhi lifeless22:14
bialixis it possible to cancel merge request in PQM queue?22:15
bialixlifeless: ^22:17
bialixtoo late. heh22:23
dysingerlooks like my question was discussed here http://www.nabble.com/Gitk-for-Bzr--td14855458.html22:25
dysingerhow would I grab bzr viz ?  home page ?22:25
dysingerI can't see much from google or search on bazaar's home page22:26
bialixdysinger: look for bzr-gtk22:26
dysingerah22:27
bialixsee http://bazaar-vcs.org/Plugins22:27
bialixit's called bzrk22:27
dysingerI know it's not important but I would like to see some sort of tig-like UI for the console.22:30
dysingerI don't want to install GTK / bzr-gtk with mac ports - mac ports sucks.22:30
ubotuNew bug: #186829 in bzr-webserve "problem occurred in a Python script" [Undecided,New] https://launchpad.net/bugs/18682922:30
dysingerTIG is a ncurses interface to GIT that simple and easy - let's you browse branches / history / diffs etc.22:31
dysingeranyway22:31
dysingerPlus then I would have to run X just to fire up bzr-gtk on mac too22:31
dysingerI know you guys are on Ubuntu full time so my comments are not important.  :)22:32
dysingerBut having a ncurses UI is awesome IMO22:32
asabildysinger: yes it would be awesome, the issue is basically that ncurses is not that nice to program with22:33
dysingerI live in the terminal22:33
asabildysinger: maybe you can try bzr-gtk in the mean time, or try qbzr22:34
asabilor you can install loggerhead on one of your servers and use the webview22:34
dysingerboth of those have huge dependencies if you aren't already on linux22:34
asabildysinger: osx ?22:35
dysingery22:35
asabilmacports works for me22:35
dysingerwell half and half - I am on ubuntu on the other half22:35
bialixwhat about Urwid framework for this stuff?22:35
asabildysinger: you can also try loggerhead22:36
dysingerok22:36
asabilit is web based22:36
dysingerurwid looks good22:36
dysingerI wish I was a python guru - I'd try to whip something up22:36
dysingerbut - *cough* - ruby, jruby, java, etc has me busy already.22:37
bialixI'm thinking about porting Urwid on Windows22:37
bialixbecause ncurses is not working on Windows22:37
asabilhmm urwid looks great22:38
bialixwe try to use it in our linux project22:39
igcmorning23:26
beunolifeless, ping23:38
beunowell, anyone else who has a few minutes, I want to blog about how people should upgrade from knits > packs, to make it a bit more widespread and would like a review before I mis-inform planet ubuntu  :D   http://www.pastebin.ca/87667523:40
beunoigc, maybe you'd like to take a crack at it?  :D23:40
* igc looks ...23:41
beuno(blog post has links to stuff and all that, just not sure how to make drafts visible for others)23:42
Odd_Blokebeuno: In (01), you effectively say 'while bzr devs know about packs'.  You probably want to add something to the effect of 'most normal users may not'.23:43
Odd_BlokeAlso, some people using bzr-svn may be using rich-root-pack or somesuch and not realise that they're already using packs.  You may want to change "(or anything different than format: pack-0.92)" to "(or anything without 'pack' in the name)".23:46
Odd_BlokeOr just add a disclaimer somewhere about bzr-svn. :p23:46
igcbeuno: the first sentence needs to be clearer I think23:47
igcI'm also not 100% sure about how to upgrade shared repos ...23:47
igcI think you need to upgrade each branch using the repo, not just run upgrade on the repo23:48
* igc checks ...23:48
beunoright, first phrase needs clearing, yes. On it!23:49
beunoOdd_Bloke, yes, although I want to keep it as simple as possible, so I might have to add a warning for bzr-svn users23:49
beunomight end up being too confusing23:50
lifelessbeuno: there is documentation about all this, in doc/developers/pack.txt or something like that23:51
beunoigc, according to the doc, shared repos are updated that way: http://doc.bazaar-vcs.org/latest/developers/packrepo.html#upgrading-an-existing-branch-or-repository-to-knitpack-format23:51
igcbeuno: checking the doc, just upgrading the repo looks ok, at least if all branches are > 0.1723:52
beunolifeless, I'll take a look at it now23:52
beunodoes the text seem sane enough?   I'd also like to see if it can go on planet bzr and on planet debian  :D23:52
igcbeuno: to get your blog included on Planet Bazaar, email or ping poolie23:53
beunolifeless, seems that's where I got the information from already23:53
igcbeuno: by "go to the branches folder", I assume you mean "go to the branch's folder", i.e. the folder for the branch23:55
igcotherwise sweet23:56
beunoigc, that's right. Fixed too23:56
beunolifeless?  you're the pack-man :p23:56
* beuno also knows lifeless is on planet debian, which would have it posted on all 3 major planets23:59

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!