=== `6og is now known as Kamping_Kaiser
[06:52] <slangasek> jelmer: hi, is there any workaround for bug #210705?  I seem to be stuck in a corner trying to do a merge of the Debian grub svn branch
[06:52] <ubottu> Launchpad bug 210705 in bzr-svn "bzr-svn forgets relationship (dup-of: 130372)" [Undecided,New] https://launchpad.net/bugs/210705
[06:52] <ubottu> Launchpad bug 130372 in bzr-svn "Abandon branching schemes" [Medium,Fix committed] https://launchpad.net/bugs/130372
[06:55] <slangasek> jelmer: hmm, n/m, it just took me forever to guess the right syntax :(
[06:56] <slangasek> well, no; it let me merge but it did it wrong, so
[06:57] <slangasek> jelmer: right, so I'm still stuck in the corner then
=== jszakmeister is now known as jszakmeister|awa
[12:51] <kumi> If I branch lp:bzr/1.9, how then do I easily upgrade to lp:bzr/1.10, when it comes out?
[12:56] <kumi> I assumed mainline would have the releases tagged, but no such thing
[13:46] <LarstiQ> kumi: what is your intent? When I branch a specific release, I want it to stay that way.
[13:47] <LarstiQ> kumi: and for the rest, I just use bzr.dev
[13:58] <kumi> I'm installing on Windows, not planning on committing anything to my local branch. Just wondering if there's an easy upgrade path when the next official release comes along
[14:13] <LarstiQ> kumi: you could `bzr pull lp:bzr/1.10`
[14:13] <LarstiQ> kumi: or just use the windows installer?
[14:16] <kumi> Thanks, I'll try the first.
[15:15] <jelmer> slangasek: Hi
[15:15] <kumi> jelmer: how can I unregister tbzr?
[15:16] <kumi> installed from source, by the way
[15:16] <kumi> I did python shellext\python\tbzr.py, and I would like to reverse that
[15:16] <jelmer> kumi, Sorry, I'm not familiar with the latest versions of tbzr..
[15:16] <kumi> Oh sorry, I just saw that others took over tbzr
[15:17] <kumi> my bad
[16:00] <visik7> hmeland: are you here ?
[16:07] <visik7>  I need to remove some files that lives in my history that are HUGE and when I mean huge I mean 600mb  that is not anymore in the tree, they are introduced at revision 4 and removed at revision 8
[16:08] <visik7> I'm playing with rebase but I really dunno how to do it
[16:50] <EarthLion> hey how can i commit and ignore 1 specific file?
[16:51] <kumi> I think the -x or --exclude switch will do that
[16:52] <kumi> you can permanently ignore a path with the "bzr ignore", or by editing the .bzrignore file
[16:54] <EarthLion> odd bzr: ERROR: no such option: --exclude
[16:54] <EarthLion> googled it and there are references to it
[16:54] <kumi> bzr help ci
[16:54] <LarstiQ> EarthLion: what version of bzr are you using?
[16:55] <EarthLion> Bazaar (bzr) 1.5
[16:55] <LarstiQ> -x got introduced in 1.6
[16:55] <EarthLion> ah that would be why
[16:55] <kumi> :)
=== Mario_ is now known as pygi
=== _thumper_ is now known as thumper
[20:50] <mrooney> Hm, I can't seem to do an export in Windows with bzr 1.9 / py 2.4
[20:50] <mrooney> "We must have one of fcntl, pywin32, or ctypes available to support OS locking."
[20:51] <mrooney> Is that expected?
[20:52] <LarstiQ> I'm afraid so.
[20:52] <LarstiQ> mrooney: so either use python2.5+, or intall pywin32 or ctypes next to 2.4
[20:54] <mrooney> Okay, and there's no installer for py2.6 right?
[20:55] <mrooney> I am only using it for 2.4 because I have that and 2.6 on my system and didn't want to install 2.5 just for bzr
[20:55] <lifeless> mrooney: I recommned using the bzr binary installer
[20:56] <mrooney> I was going to but it is 14 megs
[20:56] <mrooney> and my download speed seems to be 19k
[20:59] <mrooney> LarstiQ: pywin32 seems to have done the trick, thanks!
[21:00] <mrooney> doing stuff on windows is rather unpleasant, I am only using it to test my cross-platform app's compatibility with windows
[21:00] <LarstiQ> mrooney: k
[21:14] <jelmer> any chance somebody could have a quick look at my foreign branch RFC? I'm not looking for extensive review, just general comments as to whether it's acceptable to have this sort of thing in bzr core
[21:14] <jelmer> https://lists.ubuntu.com/archives/bazaar/2008q4/049564.html
[21:31] <kumi> Is bzr bundle deprecated?
[21:32] <kumi> It doesn't show up in bzr help commands
[21:36] <mwhudson> kumi: yes, 'bzr send' is the newer better thing
[21:36] <kumi> thanks
[21:45] <slangasek> jelmer: heya
[21:45] <jelmer> slangasek, hi!
[21:46] <jelmer> slangasek, What are you trying to do exactly that's being prevented by branching schemes?
[21:49] <slangasek> jelmer: I'm trying to merge from svn://svn.debian.org/svn/pkg-grub/grub/trunk into my local copy of lp:~ubuntu-core-dev/grub/ubuntu
[21:49] <slangasek> jelmer: and it's not working; so possibly I did something which botched the history
[21:53]  * jelmer tries to reproduce
[21:55] <slangasek> jelmer: I've tried using both svn://svn.debian.org/svn/pkg-grub/grub/trunk and svn://svn.debian.org/svn/pkg-grub/grub/trunk/debian, without success either way
[21:57] <jelmer> slangasek, what's the error you get?
[21:58] <slangasek> jelmer: "bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified."
[21:58] <slangasek> (specifying a merge base revision doesn't help, either :)
[21:59] <lifeless> jelmer: I plan to look it over
[21:59] <slangasek> jelmer: hmm, if I specify just "svn://svn.debian.org/svn/pkg-grub", it's thinking some more
[21:59] <slangasek> but afk now for dinner
[22:00] <jelmer> slangasek, thanks, I'll see if I can reproduce that here and how we can fix it
[22:00] <jelmer> bon appetit
[22:00] <jelmer> lifeless, thanks
[22:06] <pygi> jelmer, lifeless: what are the chances that you could join me in gobby session, and help write a TOC for bzr book thingy? :)
[22:16] <pygi> I'll take that as a no :p
[22:27] <lifeless> mwhudson: yo, loggerhead profiling branch for you
[22:28] <mwhudson> lifeless: also 100 million emails
[22:28] <lifeless> mwhudson: I'm wondering about the internal structure of paste vis-a-vis concurrency and profiling
[22:30] <mwhudson> lifeless: interesting, but can i talk to you about this some other time?
[22:30] <lifeless> mwhudson: Sure. btw, I'm on leave from wednesday.
[22:30] <mwhudson> ok
[22:31] <lifeless> mwhudson: oh, rockstar already merged the branch; I still want to talk though, at your convenience
[22:36] <jelmer> pygi, perhaps it's a better idea to bring it up on the list
[22:36] <jelmer> pygi, and maybe have a look at the existing docs
[22:36] <pygi> jelmer, yea, I wanted to post it on the list after I have something ready
[23:26] <lamalex> mwhudson: are you one of the loggerhead maintainers?
[23:27] <mwhudson> lamalex: i am
[23:28] <lamalex> have you had a chance to look at https://bugs.launchpad.net/loggerhead/+bug/297930
[23:28] <ubottu> Launchpad bug 297930 in loggerhead "When browsing revisions, next should go up, previous should go down, numerically" [Undecided,New]
[23:28] <thumper> sounds reasonable to me
[23:28] <lamalex> indeed
[23:29] <lamalex> i was really suprised by the current behaviour, and it's basically a two line fix
[23:32] <thumper> I hadn't even noticed...
[23:32] <lamalex> heh ;)
[23:33] <lamalex> it was driving me crazy one day so I went and patched it
[23:33] <lamalex> I run a loggerhead instance on my server so I can get to my school files quickly, and keep them versioned
[23:33] <lamalex> and for some reason I end up switching between versions a lot
[23:42] <mwhudson> lamalex: i hadn't, mainly becuase i've been on leave for the last two weeks :)
[23:55] <lamalex> ;)
[23:55] <lamalex> mwhudson: well that's a valid reason
=== RAOF_ is now known as RAOF__
=== RAOF__ is now known as RAOF_298