/srv/irclogs.ubuntu.com/2010/01/09/#bzr.txt

ronnylifeless: is git alternates networking-cappable?00:01
=== mkanat_ is now known as mkanat
ChrisMorganI have another something which occurred to me; Inkscape has a devlibs SVN repository which has lots of binaries and things in it such as are used to compile Inkscape for Windows (Python, GTK, everything except MinGW).  This could be migrated to Bazaar now without it becoming enormous with lightweight branches, couldn't it?00:05
ChrisMorganHistorically it wasn't feasible but I /think/ lightweight branches should do it.00:05
rpcesarhello. the server I am trying to make a checkout using sftp, but its not published publicly via http://. In addition, the server uses a private key (works with putty and scpftp just fine). when I attempt to set the url to sftp://username:password@mycheckout.mydomain.com/ it fails with unable to authenticate host. then says something about supported auth types and public key. I am trying to figure out how to connect using my private key.00:13
PengBazaar should find it automagically.00:15
PengSpecifying the password in the URL is weird -- it's probably making bzr decide to use password auth or somethin'.00:15
PengI don't know any of the details on how to get SSH keys working with bzr on Windows... It's easier on *nix. :P00:16
PengProbably something in the docs, though.00:16
Pengrpcesar: http://wiki.bazaar.canonical.com/Bzr_and_SSH maybe?00:18
rpcesari removed the password and username, it still doesent work right. and yes, this is on windows00:18
rpcesarim aware of placing keys in certain directories on unix, cant seem to find an equiv here00:18
rpcesarputty logs in fine, but I cannot seem to find the settings for sftp00:19
PengThere's nothing SFTP-specific here... It's just SSH.00:20
ChrisMorganrpcesar: have you used Pageant?00:21
Pengrpcesar: Did you try that link?00:21
ChrisMorganYou should start Pageant and load the key in it00:21
rpcesarok, im in it00:23
PengIn fact, that link discusses Pageant.00:23
rpcesaryep, that worked00:23
PengGood. :)00:24
rpcesarI need to keep pageant open correct?00:24
rpcesar(as it provides the keys I assume)?00:24
rpcesarnow, im still getting a different (probably unrelated) error stating that it is "not a branch"00:24
rpcesarthe folder I am browsing to contains the .bzr folder00:24
rpcesarbut its still saying "Not a branch"00:25
Pengrpcesar: Note that paths are relative from the root.00:26
Pengrpcesar: sftp://example.com/home/you/...00:26
Pengrpcesar: Or, equivalently, sftp://example.com/~/00:26
rpcesarhmm.. ok well I am actually working with a subdomain00:26
rpcesarmybranch.website.com00:26
rpcesarwhich points to the folder that contains the .bzr file (the beginning of the branch)00:27
rpcesarif I log in via scp it takes me to the right folder00:27
PengWelll...bzr wants the path from the root of the server.00:29
AfC[I hate that]00:30
rpcesarsftp://myusername@name.website.com/~/web/website.com/name00:31
rpcesarI just tried this, it navigates to the the web home directory, etc, right to the file semi absolutely00:32
rpcesarits saying not a branch aswell00:32
rpcesar(~ moves it back to home)00:32
rpcesarI also used a symbolic link of the server to link to it, and no dice00:33
PengMaybe it really isn't a branch. :D00:33
PengOn the server, what does "bzr info" say there?00:33
PengYou might have the path wrong. Or even a typo100:33
PengNice. I typod the first character after "typo".00:34
Pengtypoed? typod?00:34
rpcesarnevermind, i got it. had to actually type in sftp://username@branch.website.com/home/.....00:34
rpcesarI dont quite understand though how it does not automatically take it to the proper path00:34
fullermdPeng: The future tense is obviously "You know beforehand, just don't do it"00:35
rpcesarload branch.website.com into any sftp program and it goes right to the folder.00:35
rpcesarbut thank you so much for your help guys00:35
rpcesartoday is my first time using bzr, come rom an svn background, that just seemed so much easier :)00:36
ChrisMorganrpcesar: you'll need to have the key loaded in Pageant whenever you want an SSH connection00:37
ChrisMorganDon't worry, I had trouble with it a month or two ago when I started with Bazaar on Windows too.00:37
ChrisMorganThe people in here helped me to understand it though :-)00:38
ChrisMorganSince then, just this week I've moved to Ubuntu as my main OS and it really is a lot simpler.00:38
rpcesaryes, i love ubunto. unfortunately, when dealing with clients, unfortunately this is for work and not allowed :)00:41
rpcesarok, ran into another issue. I get ERROR: Cannot lock LockDir([path]/.bzr/branch/lock/gobbledegook.tmp) Permission Denied. when I attempt to commit00:42
=== jfroy|work_ is now known as jfroy|work
lifelessrpcesar: sounds like you don't have permissions to do the commit01:05
lifelessrpcesar: as for what /~/ wasn't working - I dunno, it works for other users. Perhaps its a special sftp server?01:05
EdWyse_Officecould someone familiar with setup.py take a look at http://paste2.org/p/600644 and tell me if that's the correct way of including the include file in MANIFEST?01:13
lifelessMANIFEST.in is the normal way01:15
EdWyse_OfficeExcept MANIFEST.in isn't in the dev tree.01:15
EdWyse_OfficeMy intention is to create a patch that will allow bdist_rpm to be made.01:16
lifelessEdWyse_Office: do add MANIFEST.in01:21
lifelessEdWyse_Office: didn't jam paste a patch for you the other day01:21
EdWyse_OfficeYeah, and it didn't work.01:21
aidalgolMy clone operation just failed with a 110 error.  How can I tell bzr to pick up where it left off?01:22
EdWyse_OfficeSo I grabbed the source repo and I'm looking at how the devs designed it to work.01:22
EdWyse_OfficeSince I have more time now...01:22
GPHemsleyHow do I get $Id$ to expand again?01:22
aidalgolxb01:24
aidalgolOops!  Ignore that.01:24
spivGPHemsley: the bzr-keywords plugin01:30
GPHemsleyspiv: Remind me how to activate that? :/01:31
spivGPHemsley: it should come with docs01:31
spivGPHemsley: (I'd have to go read them too)01:31
fullermdIt's not really usable in practice.01:32
GPHemsleywhere are they? `bzr help keywords` didn't work01:32
fullermdIt does once you install the plugin  8-}01:32
GPHemsleyoh, I thought it said it comes with Bzr... I hate Launchpad.... *grumble grumble*01:33
GPHemsleyso, uh, how do I install it?01:36
lifelessEdWyse_Office: We haven't tried to make bdist_rpm work :)01:36
lifelessEdWyse_Office: so don't limit yourself to what we do at the moment01:36
fullermdGPHemsley: Something like `bzr branch lp:bzr-keywords ~/.bazaar/plugins/keywords/`01:37
EdWyse_Officelifeless: I found the right way to do it using distutils.extension now, so unless you /really/ don't want me to do it in setup.py...01:38
GPHemsley$Id$ isn't in the list of supported keywords now output by `bzr help keywords` :/01:39
lifelessEdWyse_Office: I don't particularly care; the reason I say MANIFEST.in is because thats what is usually used for increasing the manifest01:39
EdWyse_Officeok01:40
spivGPHemsley: yeah.  It should probably be added, although it is a bit of an odd fit because bzr versions trees, whereas cvs versions individual files.01:42
GPHemsleywell, SVN has it, too...01:43
lifelessGPHemsley: svn also versions individual files01:43
fullermdWell.  All the existing keywords all refer to just the file too anyway.01:43
GPHemsleylifeless: Not insofar as assigning an ID number01:44
lifelessWhile I think we're too tree orientated, we're the same as git/hg/monotone/codeville/etc01:44
spivfullermd: yeah01:44
fullermdIt just misses the aggregation of $Id$01:44
spivfullermd: like I say I think it probably ought to be added01:44
lifelessGPHemsley: Last I checked the internals, it did.01:44
GPHemsleylifeless: a revision ID refers to a whole collection of files01:44
GPHemsleylifeless: How it stores it internally may be another story01:45
lifelessGPHemsley: thats precisely what I mean, ids refer to things changed in svn, not to the state of a whole tree01:46
GPHemsleyoh01:46
lifelessyou can infer the state of a whole tree, but if compare with bzr/git/etc the whole tree /changes/ to record a commit01:48
lifelesswhich is a fundamental difference01:48
GPHemsleywell, I'm not interested in the rev ID for $Id$ so much as all the rest of the data01:48
lifelesswhat data is that01:49
fullermd...  well, I use $CVSHeader$ rather than $Id$, but it's the same aside from the path...    Path, version, date, committer, state.01:52
lifelessGPHemsley: you probably want a pre commit start hook then02:01
lifelessGPHemsley: or something like that02:01
GPHemsleylifeless: Here's an example from SVN: $Id: LICENSE 50 2009-06-24 22:12:19Z gphemsley $02:03
lifelessGPHemsley: and that adds lines on each commit?02:03
lifelessor just the one line02:03
GPHemsleyjust the one02:03
lifelessok keywords probably does it then02:03
fullermdIt has the individual pieces of information; it doesn't have a keyword that aggregates 'em all.02:04
fullermdSo you could just put a /* $Path$ $Revision-Id$ $Date$ $Committer$ */ sorta thing together.02:05
GPHemsleyyeah, but that's a bit much02:09
fullermdI doubt it'll be too hard to add $Id$; it'll probably show up eventually.02:12
fullermd'minds me, I need to file a bug about the collapsing...02:13
EdWyse_OfficeOk, lifeless, I apologize. I was wrong about distutils (though I still consider it a bug not to include dependencies in the manifest). I'll make the MANIFEST.in file02:31
lifelessEdWyse_Office: if it works for you, thats all that matters; the rest is detail02:42
EdWyse_OfficeYeah, it didn't, but now I know why at least.02:43
lifelesswhy didn't it work?02:45
EdWyse_OfficeIt's just not designed to include .h files, regardless of the Extension declaration. Making my rpm now, let's see if it works...02:48
EdWyse_OfficeSame problem as last time... bdist_rpm fails to build the package because rpm is expecting to find the manpage bzr.1 and instead finds bzr.1.gz. It turns out to actually be a distutils bug: http://bugs.python.org/issue64474403:20
Kamping_Kaiseris there any reason in particular why bzr log -r -3.. acts differently to bzr diff -r -3..? (the former displays the last 3 log entries, the later does nothing)03:25
Kamping_Kaiserhm, perhaps i ran it wrong03:25
fullermdWell, if there aren't any differences between the files in -3 and -1...03:26
Kamping_Kaiserlooks like thats the case - commit -1 is nothing but a commit entry03:28
Kamping_Kaiserjoys of rebasing *heh*03:28
Kamping_Kaiserthanks for the quick responce too03:29
HFSPLUS!ops03:42
ubottuHelp! Channel emergency! (ONLY use this trigger in emergencies) -  elky, Madpilot, tritium, Nalioth, tonyyarusso, PriceChild, Amaranth, jrib, Myrtti, mneptok, Pici, Jack_Sparrow, jpds, bazhang, jussi01, Flannel or ikonia!03:42
poolieHFSPLUS: ?03:43
RAOFAgain?03:43
HFSPLUS!ops03:43
ubottuHelp! Channel emergency! (ONLY use this trigger in emergencies) -  elky, Madpilot, tritium, Nalioth, tonyyarusso, PriceChild, Amaranth, jrib, Myrtti, mneptok, Pici, Jack_Sparrow, jpds, bazhang, jussi01, Flannel or ikonia!03:43
RAOFpoolie: They come on to Ubuntu-related channels and call the ops untill they get kicked.  Don't ask me why.03:43
fullermdSome filesystems are weird like that.03:44
RAOFHeh.  I've seen a number of people complaining about hfs+ recently :)03:45
lifelessEdWyse_Office: sounds like you need to fix distutils :(03:51
=== oubiwann_ is now known as oubiwann
rukii am getting this error: http://pastebin.com/m3965372f while pushing to my branch07:39
lifelessruki: give break lock the same url you pushed too07:43
lifelessthe error is misleading about the url to use07:44
rukilifeless: http://pastebin.com/d6fd1ce8a07:50
Pengruki: Follow what it says. :P07:54
rukiPeng: ok07:54
Peng...07:54
lifelesspoolie: #subunit exists btw, if you like08:55
lifelesspoolie: I wish lp bugs mail was a little friskier09:18
Adyswasn't there a way to avoid committing files unless specified in bzr ci, without adding them to bzrignore?12:14
Kamping_Kaiser--strict?12:15
Adysno, more like; i have some local.py file; i run bzr something local.py; bzr ci; it doesn't commit local.py but commits the rest12:15
Adysuntil I bind it again to the branch12:16
Adysa local bzrignore basically12:16
Kamping_Kaiserhm. bzr shelve?12:16
Adyslooks right, thanks!12:16
Kamping_Kaisernp :)12:16
spivThere's a --exclude option for bzr ci, too.12:17
Adysspiv: yeah but that involves typing it every time12:17
spivWell, not really any worse than bzr shelve.12:17
spivYou could make an alias for it, though, if it's always the same file(s).12:17
Adysbzr shelve is only typed one until unshelve12:18
spivOh, I see.12:18
spivI was thinking that you'd still want it in the workingtree after the commit.12:18
Adyswell the files themselves stay in the working tree, its just ignored by bzr commit12:19
Adysfrom what I understand, anyway12:19
spiv'bzr shelve' will move uncommitted changes from your working copy onto a "shelf"12:19
spivSo if you did e.g. "bzr shelve --all", then "bzr st" would show no changes.12:20
Adyswell yeah12:20
spivAnd if you opened the files in an editor, you wouldn't see the changes either.12:20
Adysuh12:20
Adysoh12:20
Adyshmm yeah thats not it12:20
spiv(Until you unshelved them, of course)12:20
spivIt would be fairly easy to write a plugin to do what you want, I think.12:22
Adyshmmm I was sure it was in bzr12:22
spivPerhaps add a 'bzr hold-file FILE ...' command that adds file-ids to a list in .bzr/checkout/held-files, and a corresponding 'unhold-file' command.12:23
spivAnd it would wrap 'bzr commit' to automatically pass those files to commit's --exclude.12:24
Adysyep12:24
spiv(Possibly add an --override-holds option too)12:24
spivIf it wasn't getting late here I might try doing it now :)12:24
AdysI'll try doing it12:25
spivCool.12:25
Adysreading up on bzr plugin doc12:25
spivAsk here or on the list if you get stuck.12:25
Adyskay :)12:25
spivAs far as your original question, as you've probably gathered I don't know of an existing solution for that.12:25
spivWell...12:26
spivYou could perhaps use looms like this, sort of, but that would be overkill and clumsy.12:26
Adysspiv: how do you pass multiple arguments to --exclude?12:27
Adys--exclude "foo.py bar.py" ?12:27
Adysalso good to note --exclude / -x isn't in bzr help ci12:29
spivAdys: Hmm, I see it in that help12:32
spivAdys: I would expect you can pass multipe -x options12:33
Adyshttp://dpaste.com/142859/12:33
spivAdys: i.e. -x foo.py -x bar.py12:33
Adysill try12:33
spivAdys: it's there on line 20 of that paste?12:33
AdysI'm blind :/12:34
Adysand yes, multiple -x works12:34
Adysthanks :)12:34
spivIt doesn't help that there's no obvious ordering to the list of options.12:34
lifelessspiv: BTW,  have I pointed you at lp:testrepository ?12:55
=== menesis1 is now known as menesis
spivlifeless: not until just then ;13:11
spiv;)13:11
spivGar, the "Subscribe to mailing list" link fails to take to me a page from which I could actually subscribe to the mailing list.13:15
lifelessspiv: which link? I can fixness13:32
spivlifeless: the one on https://edge.launchpad.net/~testrepository-dev, I'm not sure if you can actually fix that.13:35
lifelessoh, maybe not as easily ;)13:35
spivlifeless: (it was where the "Unsubscribe" button now is for me)13:35
lifelessspiv: did you file a bug for barry?13:36
spivIt took my to my +editemails page, which isn't particularly useful.13:36
lifelessoh right, yes.13:36
spivNo, but only because it's much too late at night to be filing coherent bugs.13:36
spivEspecially in this heat.13:36
lifelessbugs aren't lasers :). speaking of the time... gnight.13:36
rukdo i have to add, commit everytime i have to update my branch ?15:21
rukor do i just have to bzr push?15:21
lukscan you reformulate the question?15:22
lukswhat do you want to do?15:22
Colonel-Rosamorning, does bzr have commit globbing?15:43
Colonel-Rosabzr ci *index.php15:43
Colonel-Rosacommits all index files15:43
luksyour shell does that15:44
Colonel-Rosanvm, got it15:44
bendjHi.  With scheme=ssh in my ~/.bazaar/authentication.conf, how/where do I specify a *different* ssh config file?  atm, i get: "Bad owner or permissions on /root/.ssh/config" if I, e.g., try to exec 'bzr branch lp:pressflow pressflow6-core'.  Not surprising, since my ssh config is at a different, non-default file path...18:43
bendjReading @ http://doc.bazaar.canonical.com/latest/developers/authentication-ring.html, I don't see (?) any way to spec the ssh config path :-/18:45
Peng...You're running bzr as root...?19:01
PengOh, you're gone too.19:01
=== oubiwann_ is now known as oubiwann
=== oubiwann_ is now known as oubiwann
EdWyse_MobileAny idea how to fix this segfault, http://paste2.org/p/601692 , in the 2.0 branch? ( or at least where to start looking )20:29
pooliehi EdWyse_Mobile20:30
pooliewow20:30
poolieplease file a bug for it20:30
pooliebasically i'd look at why that pointer could get to be null20:30
SupertankerWould it be appropriate to use bazaar to keep track of versions and revisions of my novella document files? Or am I looking for some other sort of backup/revision solution?20:59
gutworthSupertanker: do you write them?21:32
ronnyanyone got an idea where jelmer is, i got a pair of trivial subvertpy patches for him21:34
Supertankergutworth, yep21:46
SupertankerMy current system is tons of .odt files in a directory with different names :P21:46
gutworththen that would be reasonable21:46
SupertankerHuh, okay.21:47
gutworthah, bzr doesn't do great with binary files21:47
SupertankerI was just wondering if there was another way to do it.21:47
SupertankerI thought .odt was a sort of .xmlish format?21:47
Supertanker(Probably not :P)21:47
gutworthit's a compressed directory of xml files I believe21:47
gutworthso binary21:47
SupertankerO.o21:47
SupertankerNope, it's not text21:47
gutworth/compressed/21:47
SupertankerYeah, that makes sense21:48
SupertankerWhat about .abw files?21:48
SupertankerI believe those are plaintext.21:48
SupertankerUnless specifically saved as .abwz or .abwbz21:48
SupertankerOh, there we go21:49
SupertankerI could save it as Open Document Text (Flat XML)21:49
=== nailuj24_ is now known as nailuj24
bendjI'm setting up a bzr-based development/staging/production workflow.  Seems there are countless ways to do this.   It's just for me -- no other devs -- and I'm wondering (1) with atomic commits @dev, do I really need a standalone staging step? (2) should production be a branch, checkout, or rsync of a 'working' dev/staging branch? What do folks here do for 'best practice'?23:11
spivbendj: it depends on what you want from your production rollouts23:26
spivbendj: but keep in mind for example that neither 'bzr co' or 'rsync' will atomically update a tree on disk.  So if this a website, a client might hit the site while only half the files are updated.23:27
bendjspiv In my case, the production site is my live drupal (actually, pressflow) site.  and, no, i haven't figured out yet how i'll stage the databases .... ;-)23:27
spivbendj: so you might want to checkout or rsync to a separate directory, then do a rename or update a config file to point at the new location, if that scenario concerns you.23:28
spivbendj: but basically any of a checkout, rsync, or say the bzr-upload plugin will do an decent job of actually getting onto disk on your production server.23:29
bendjspiv Hm.. Hadn't considered the rename/update options.  Was thinking that I *need* to drive everything via bzr.23:30
spivs/actually getting/actually getting files/23:30
spivWell, a checkout that you update would have an advantage that it's easy to see which version has been rolled out compared to the current development version.23:31
bendjspiv except that rsync would leave the production site itself NOT under revision control, tight?23:31
spivBut depending on how tightly you control your rollout process, perhaps you'd already know that anyway.23:31
bendjOh, ... didn't look up23:31
spivbendj: right, but you're not going to be editing files on production are you? :)23:31
bendjWho me? Never! UhUh! Nope! No Sir!  That would be nuts! ;-p23:32
spiv:)23:32
bendjWell, to be technically correct -- I'll not be editing the production site's files.  I will be editing (occassionally0 ON the production box, but in dev/staging checkouts; I'm thinking about a bzr-server centralized repo scenario, and checkouts,etc to numerous locations as required (e.g., home, laptop, remote, etc etc)23:34
bendjUnrelated (mostly) question.  Can bzr be KDE (or would it be @filesystem) -integrated, so that the last N (say 10 ...) saved versions of a file are available?  E.g., doing image editing in a directory using GIMP, I could certainly do that if I checked out the file/directory first using bzr, then commit after edit.  But anything integrated as of yet?  I've seem such capabilities @ a Solaris demo once, but I think that was embodied in the ZFS file system.23:37
bendjs/seem/seen/23:38
spivbendj: nothing integrated as yet, sadly23:44
spivbendj: it would be lovely to have, of course!23:44
spivbendj: I think it really would need to work at the app level rather than filesystem to work well, the filesystem just isn't given enough information to know reliably when a change has been fully written or if a replaced file is a new version of the old one or not.23:45
bendjspiv found it! -> http://www.serverwatch.com/tutorials/article.php/3831881/Say-Cheese-OpenSolaris-Time-Slider.htm23:55
bendjiirc, it's file-level restoration across numerous prior versions23:55
bendjusing ZFS' capabilities.  i.e. @ the filesystem level23:56
RAOFYeah; something similar will be possible with brtfs.23:59

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