/srv/irclogs.ubuntu.com/2011/10/21/#bzr.txt

michaelh1Hi there.  Can I add meta data to a commit?  I want to tag a commit as 'will not be sent upstream'00:25
james_wmichaelh1, there are revision properties, but I don't think that core provides command line options to set them00:31
michaelh1OK.  I can embed meta data in the comment just fine.00:32
=== AuroraBorealis is now known as aurora|away
=== michaelh1 is now known as michaelh1|away
lamontjelmer: two things are needed for hardy to fully disappear from the buildds: 1) an LTS with xen support (for the ppa host, especially - not actually a hard hard requirement), and 2) distro telling us that they're happy with using something newer than hardy to build all of the supported releases - dapper's EOL helps with that discussion, fwiw02:27
=== zyga is now known as zyga-afk
vilahello bzr world06:58
jammorning all07:04
mgzmorning08:06
vilamgz: _o/08:09
mgzmorning jelmer. do you know off hand where the python-debian upstream repo is?08:15
jelmermgz: "bzr info apt:python-debian" :-)08:15
jelmeror, if you have bzr-git installed: bzr branch apt:python-debian08:16
jelmergit://git.debian.org/git/pkg-python-debian/python-debian.git08:16
mgz...oo, new command to me08:16
* mgz tries it08:16
jelmeryou need bzr-builddeb08:17
mgzdeprecation warnings, and it works08:17
mgzI am impressed.08:17
jelmerhmm, what deprecation warnings?08:28
jelmer(are you on oneiric?)08:28
mgzI'll put up a branch, it's a trivial spelling of fallback thing08:28
mgztwo in the style of:08:29
mgzbzrlib/plugins/builddeb/directory.py:47: DeprecationWarning: Attribute 'Lookup'08:29
mgzof the 'apt_pkg.SourceRecords' object is deprecated, use 'lookup' instead. lookup = getattr(sources, 'lookup', getattr(sources, 'Lookup', None))08:29
mgzvila: babune windows seems especially unhappy of late09:27
vilamgz: :-/09:28
vilasomeone needs to bring it back to life :-/09:29
mgzI seem to remember we had a can't-delete-sh-file problem before and fixed it, but I don't remember how09:29
vilathe infamous 'unable to delete <some tmp file>' was spurious but seem to turn into permanent09:29
vilawe never fixed it, it's a jenkings issue which kind of flip-flop over time09:29
vilathere is a 'hudson.remoting.RequestAbortedException: java.io.StreamCorruptedException: invalid type code: 68' in the backtrace doesn't look good09:30
vilamay be related to the leaks too (the leaks in (or releated to) the subunit stream09:31
mgzyeah, seems like something is leaking through a stream, if that's even possible09:31
mgz...vila wins again09:31
vila?09:32
mgzyou said the same thing, faster :)09:32
vilaha :)09:32
vilaworth noticing then, 'cause you're the fastest most of the time ;)09:32
vilalol09:39
vilajust found a cryptic YARXU commit message....09:39
vila.. wondered a bit09:39
vila... triggered my acronym decipherer09:40
vila... first guess: Yet Another Random Xml Update09:40
vilawin ! :)09:40
vilaI really wish we add a way to get better diffs (and commits) when xml files are involved. Most of the time one or two attributes in a "dict" are modified but the key/values are randomly shuffled. The end result is unreadable09:41
jelmervila: it would be really nice to have a mechanism for diffs similar to the merge hooks we have09:42
vilaindeed, they are closely related...09:43
jelmeralso, we currently already have some form of custom diff displayers09:43
jelmersince we don't diff binary files by default09:43
vilaand doesn't qbzr display image diffs too ? (or rather both images)09:46
jelmervila: I wasn't aware of that. If it does, that's pretty cool10:03
jelmerI know github has some fancy stuff for displaying image diffs10:04
mgzokay, this looks tractable10:06
* mgz is back on bzr-builddeb10:06
mgzor rather, the mess that is python-debian r9510:07
jelmerwhere everything magically became unicode?10:07
mgzyeah, but without ever checking the inputs10:08
mgzugh, setup.py.in10:21
* mgz just copies it10:21
jelmermgz: debian/rules has the magic to generate the setup.py IIRC10:22
jmlhttps://code.launchpad.net/~jml/udd/less-in-top-level/+merge/80037 up for review10:23
mgzwants setuptools for no good reason too.10:23
jelmerhey jml10:23
jmljelmer: hi10:23
mgzand given that it's just for a version number... which I don't even seem to be able to get at from the installed package, screw it10:23
mgzwhat is it with people using fancy conf stuff on python packages then not actually having __version__ anywhere10:25
* mgz eyes subunit10:25
lifelessmgz: patches appreciated10:28
mgzI'd have to learn how all that worked to do that lifeless, which is exactly what I'm avoiding :)10:29
vilamgz: windows slave still failing but at least with results11:52
mgzwoho.11:53
mgzI've got bugs on the failures.11:53
vilayakafokon :)11:54
vilaimmortal chroots are pita12:16
mgzyou dig them up but they keep on growing back?12:16
vilathey refuse to die12:17
vila..can survive reboots and stay around for months12:18
mgzokay, enough random poking of plugins, it's lunchtime12:18
vilaluckily it doesn't happen often (which of course makes it even harder to understand the cause)12:18
vilabon appetit12:19
ccxCZghost in z shell? :-)12:27
AuroraBorealisspeaking of those12:27
AuroraBorealisthe archive bit on some of my files refuses to clear :<12:27
=== AuroraBorealis is now known as aurora|away
mgzhm, that was a failed attempt at not getting release notes conflict16:00
=== deryck is now known as deryck[lunch]
jmlmgz: thanks for the review16:31
jmlmgz: would you please merge the branch for me?16:31
mgzjml: I don't have access either, will poke vila16:53
p2000hello17:04
p2000bzr wizards17:04
p2000how do you translate "git --format-patch" to bzr ?17:04
jmlmgz: thanks.17:05
mgzp2000: `bzr help bundle` is the diff + metadata thing in bzr17:07
mgzs/is/for/17:07
p2000it would b great if i could get the metadata in plaintext as well ... any option ?17:08
p2000(havent found)17:08
mgzformat-patch is a bit cuter like that, but I never worked out how to send more than one revision with it17:09
mgzI think there's a send email to file way of doing it17:09
p2000just now i realize format-patch is probably not what i'm looking for ... intension misleaded me ... i saw the specific feature in gitweb only so far ... there i was able to get a page thatt shows me all commit messages along with the patches in a flat text file ... that's what i'd like to get from bzr but don't know how to get it from git actually ...17:11
p2000s/intension/intention/17:11
p2000s/wrong/right/17:11
mgzs/True/False/ ? :P17:12
mgzp2000: like `bzr log -p` maybe?17:13
p2000yes ... looks realy good !17:15
p2000that was it! ... thank you very much mgz !!!17:18
p2000:-) same as in git i guess ...17:18
p2000the 2 dvcs's are on par feature & technology -wise at the moment ... or what do the bzr-wizards say ?17:19
wgzthere's still enough minor things for people to argue about :)17:20
p2000i mean git vs bzr ... bzr seems to have been quickly developping ... sure17:20
p2000but there are no more minor differences i guess ... expect design of course17:21
p2000anyway, thanks !! hanwe17:22
=== deryck[lunch] is now known as deryck
=== jam2 is now known as jam
james_wwgz, how does anyone add you to a team in Launchpad?18:45
james_wah, I can avoid the javascript version and do it18:46
briandealwisjelmer, I just did a dpush to an eclipse repository and seem to have deleted most of the branches other than the branch I was pushing to and to master20:18
briandealwis(with bzr-git)20:18
=== yofel_ is now known as yofel
wgzjames_w: it's not just that I like making life hard for people...20:40
wgzthanks for the conscription!20:41
jelmerbriandealwis: what versions of bzr-git/dulwich ?22:24
briandealwisbzr-git 0.6.2 and dulwich 0.8.022:24
briandealwisIt unfortunately happened after the support staff had left for home for the weekend.22:25
jelmerouch, sorry :-(22:25
jelmerI've hit this before with tags and subsequently fixed it. I guess it's not in any releases yet22:25
briandealwisI'm pretty sure I've dpushed to this repository previously though, without this problem!22:25
briandealwisIt would be nice to have a --dry-run flag :)22:27
jelmerbriandealwis: that wouldn't really help with a bug22:28
briandealwisI'm kinda joking.  I had wondered why the push was taking so long.22:29
briandealwisAnd we can't just recover by providing another packed-refs: unfortunately the push seems to have triggered a gc on the other side.22:30
briandealwisI had meant to ask you what happens with dpush and tags, and if there's a way to not push tags22:31
jelmerbradm: there is no way to not push tags22:44

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