[07:13] Good morning [08:01] morning! [08:02] moin [08:06] :) Do you have a few minutes to try and help me with the 2a to pack merge recipe? (BTW: I've raised the request to upgrade the repository - the discussion looks positive so far) [08:14] kinkie: how far did you get? [08:16] not very, as I didn't understand how I was supposed to be doing it. I don't understand how to select the changesets to fast-export [08:18] I guess it may be something like -r submit:..-1 ? [08:23] right, there is a revision param, which yo can pass the range of commits you want [08:24] but submit: probably won't work? just find out the revno of the last common rev however [08:25] I'm trying to merge into trunk, and there have been quite a few merges from trunk to the branch.. is that dealt with? [08:26] good question. [08:27] I suspect that will mess things up, but can't see without trying [08:28] I'm also trying [13:44] hi [13:50] any idea what this kind of error is guys ? [13:51] bzr: ERROR: exceptions.AssertionError: get_next() called when there are no chars left [13:51] this is producing only on one of my branches, the others are working correctly [13:51] so i suppose the problem come from the .bzr folder, but i have no idea where to search === Merwin is now known as ThibautD [16:05] what was the command again to see "dangling" heads in bzr [16:06] e.g. the ID of commits I uncommitted [16:11] xnox: `bzr heads` which is part of the bzrtools plugin [16:13] mgz: ok. thanks. not sure why it kicked off bzr-svn cache a non-bzr-svn branch. maybe shared repo had some bzr-svn revisions =/ === yofel_ is now known as yofel [20:15] is there any way to continue a bzr git import that failed do to running out of disk spacE? [20:21] yes, just continue; its incremental [20:49] sorry, forgot to mention this is local [20:49] and if the answer is the same, how? [20:57] micahg: first do $ bzr pull -r1 [20:57] micahg: then every subsequent pull is incremental [20:58] micahg: you are probably stuck with incomplete bzr tree which bzr doesn't like at all.... =( [20:58] (tree/branch/checkout) [20:59] that's from my eperience of doing git -> bzr of binutils&gcc repositories [21:01] I usually looped @ about 1000 revisions. [21:01] for me it was not the case of disk space, but rather running out of ram. So i'd trigger manual repacks as well. [21:11] xnox: ah, ok, I've got plenty of RAM, but little disk space :) [21:12] micahg: branch one revision, loop as you feel need & repack in between. Repack twice to delete redundant packs. [21:12] the problem is that branching didn't finish, so it's not a real repo yet [21:12] micahg: $ bzr branch -r1 [21:12] =) [21:12] micahg: $ bzr branch -r1 $URL [21:12] so, I have to start over though? [21:12] yes, sorry. [21:12] 22G ATM :( [21:13] micahg: is it public? I can probably create you a branch. [21:13] =) [21:13] no, I need it locally :) [21:13] well, it's public,, yes, but I need it locally [21:39] lifeless: was your continue comment only for an LP bzr branch or for a local one as well? [21:40] micahg: both [21:40] micahg: bzr-git conversions are incremental [21:40] lifeless: ooh, how to continue :) [21:40] as xnox said [21:40] there may be a simpler way [21:40] jelmer: would know [21:41] bzr: ERROR: This operation is not supported by the Git smart server protocol. :(