| kinkie | Good morning | 07:13 |
|---|---|---|
| mgz | morning! | 08:01 |
| jelmer | moin | 08:02 |
| kinkie | :) 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:06 |
| mgz | kinkie: how far did you get? | 08:14 |
| kinkie | 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:16 |
| kinkie | I guess it may be something like -r submit:..-1 ? | 08:18 |
| mgz | right, there is a revision param, which yo can pass the range of commits you want | 08:23 |
| mgz | but submit: probably won't work? just find out the revno of the last common rev however | 08:24 |
| kinkie | 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:25 |
| mgz | good question. | 08:26 |
| mgz | I suspect that will mess things up, but can't see without trying | 08:27 |
| kinkie | I'm also trying | 08:28 |
| Carpette | hi | 13:44 |
| Carpette | any idea what this kind of error is guys ? | 13:50 |
| Carpette | bzr: ERROR: exceptions.AssertionError: get_next() called when there are no chars left | 13:51 |
| Carpette | this is producing only on one of my branches, the others are working correctly | 13:51 |
| Carpette | so i suppose the problem come from the .bzr folder, but i have no idea where to search | 13:51 |
| === Merwin is now known as ThibautD | ||
| xnox | what was the command again to see "dangling" heads in bzr | 16:05 |
| xnox | e.g. the ID of commits I uncommitted | 16:06 |
| mgz | xnox: `bzr heads` which is part of the bzrtools plugin | 16:11 |
| xnox | 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 =/ | 16:13 |
| === yofel_ is now known as yofel | ||
| micahg | is there any way to continue a bzr git import that failed do to running out of disk spacE? | 20:15 |
| lifeless | yes, just continue; its incremental | 20:21 |
| micahg | sorry, forgot to mention this is local | 20:49 |
| micahg | and if the answer is the same, how? | 20:49 |
| xnox | micahg: first do $ bzr pull -r1 | 20:57 |
| xnox | micahg: then every subsequent pull is incremental | 20:57 |
| xnox | micahg: you are probably stuck with incomplete bzr tree which bzr doesn't like at all.... =( | 20:58 |
| xnox | (tree/branch/checkout) | 20:58 |
| xnox | that's from my eperience of doing git -> bzr of binutils&gcc repositories | 20:59 |
| xnox | I usually looped @ about 1000 revisions. | 21:01 |
| xnox | 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:01 |
| micahg | xnox: ah, ok, I've got plenty of RAM, but little disk space :) | 21:11 |
| xnox | micahg: branch one revision, loop as you feel need & repack in between. Repack twice to delete redundant packs. | 21:12 |
| micahg | the problem is that branching didn't finish, so it's not a real repo yet | 21:12 |
| xnox | micahg: $ bzr branch -r1 | 21:12 |
| xnox | =) | 21:12 |
| xnox | micahg: $ bzr branch -r1 $URL | 21:12 |
| micahg | so, I have to start over though? | 21:12 |
| xnox | yes, sorry. | 21:12 |
| micahg | 22G ATM :( | 21:12 |
| xnox | micahg: is it public? I can probably create you a branch. | 21:13 |
| xnox | =) | 21:13 |
| micahg | no, I need it locally :) | 21:13 |
| micahg | well, it's public,, yes, but I need it locally | 21:13 |
| micahg | lifeless: was your continue comment only for an LP bzr branch or for a local one as well? | 21:39 |
| lifeless | micahg: both | 21:40 |
| lifeless | micahg: bzr-git conversions are incremental | 21:40 |
| micahg | lifeless: ooh, how to continue :) | 21:40 |
| lifeless | as xnox said | 21:40 |
| lifeless | there may be a simpler way | 21:40 |
| lifeless | jelmer: would know | 21:40 |
| micahg | bzr: ERROR: This operation is not supported by the Git smart server protocol. :( | 21:41 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!