=== psynaptic|away is now known as psynaptic
[03:53] <psusi> how do you get bzr to remove unknown files?  like git reset --hard?
[03:56] <poolie> psusi, bzr clean-tree
[03:57] <psusi> ahh, ty
[03:58] <poolie> np
[03:59] <poolie> see also 'bzr clean-tree --ignored
[10:17] <luks_> any way around this? http://paste.pocoo.org/show/368383/
[10:18] <luks_> LP seems to be trying to stack on a branch with incompatible format, which fails
=== psynaptic is now known as psynaptic|away
[11:00] <thumper> luks_: either upgrade trunk to 2a, or pester the bzr devs to add a flag to push to say (no... really don't stack)
[11:01] <thumper> luks_: there is an incredibly hacky solution that used to work
[11:01] <thumper> I'm not sure if it still will...
[11:01] <thumper> you start a push but terminate it with Ctrl-C
[11:02] <thumper> that creates the basics of the branch and db structure
[11:02] <thumper> but it hasn't set any stacking info
[11:02] <thumper> then you push again
[11:03] <luks_> thumper: I've found out that nosmart+lp: works
[11:03] <thumper> really?
[11:04] <luks_> yep, it doesn't try to stack
[11:04] <thumper> weird
[11:04] <thumper> that is probably a bug :-)
=== psynaptic|away is now known as psynaptic
=== psynaptic is now known as psynaptic|away
[14:50] <camason_> hi guys. I've SSH into a remote machine and I'm trying to do some merging etc, but I'm getting `bzr: ERROR: gnomekeyring.IOError:`
[14:57] <jelmer> camason_: that's a known bug in bzr-gtk, should be fixed in newer versions
[16:23] <camason_> jelmer ok - any way I can merge whilst over ssh?
[16:24] <jelmer> camason_: install a newer version of bzr-gtk or disable it for the moment
[16:24] <jelmer> e.g. by setting BZR_DISABLE_PLUGINS=gtk
[16:24] <cheater00> hey guys
[16:24] <jelmer> hi cheater00
[16:24] <cheater00> is there a way to continuously use both hg and bzr?
[16:24] <cheater00> at the same time?
[16:25] <jelmer> cheater00: how do you mean?
[16:25] <cheater00> i have a bzr repository, but i want to start using fogbugz and kiln
[16:25] <cheater00> kiln is hg based
[16:25] <jelmer> cheater00: there is a bzr-hg plugin which adds support for hg format repositories to bzr
[16:25] <jelmer> I should note it's alpha at this point though
[16:25] <cheater00> what about converting from bzr to hg?
[16:26] <cheater00> and keeping on converting every time i push to bzr?
[16:26] <cheater00> like a bidirectional bridge ..
[16:28] <jelmer> cheater00: you cna push from a bzr branch into a hg branch but you'll lose some metadata
[16:29] <cheater00> what metadata do i lose?
[16:29] <jelmer> and that's still very much experimental as well
[16:29] <jelmer> cheater00: renames, revision properties, revision parents if there are more than two
[16:30] <jelmer> cheater00: see "bzr dpush"
[16:32] <cheater00> why are renames lost?
[16:32] <cheater00> i'd have expected hg to support something as simple as this
[16:34] <jelmer> cheater00: they're copies + deletes in hg, don't map easily to renames in bzr
[16:34] <cheater00> hmm... why?
[16:36] <jelmer> cheater00: why what?
[16:37] <cheater00> why don't copy+delete in hg map easily to renames in bzr?
[16:37] <jelmer> cheater00: it's hard to get it to work while not hurting performance significantly
[16:38] <jelmer> cheater00: anyway, for the moment bzr-hg dpush is probably not ready for production use
[16:38] <cheater00> oh? how so?
[16:38] <cheater00> gotcha
=== psynaptic|away is now known as psynaptic
=== Ursinha is now known as Ursinha-afk