| poolie | glyph: i don't see it there | 00:04 |
|---|---|---|
| poolie | igc, hi | 00:04 |
| === lifeless_ is now known as lifeless | ||
| === TheMuso_ is now known as TheMuso | ||
| lifeless | jam: I think you should land your gc change | 00:38 |
| lifeless | jam: I haven't fully reviewed, but its definitely conceptually fine | 00:39 |
| RaceCondition | is there a way to, instead of unshelved changes, commit shelved changes only? | 01:06 |
| lifeless | RaceCondition: shelve you current changes, unsehlve the ones you want to commit, commit. ? | 01:09 |
| RaceCondition | lifeless: um, yeah, but you didn't answer my questio | 01:09 |
| RaceCondition | is it possible or not to commit shelved changes | 01:10 |
| RaceCondition | smth like bzr commit -m "msg" --shelved | 01:10 |
| RaceCondition | apparently not, though, google gives me nothing on this | 01:11 |
| lifeless | no there is no direct way to do this today | 01:12 |
| spiv | Random observation: bzrlib.errors.AmbiguousBase has been deprecated since 0.8 | 01:15 |
| spiv | We should delete it... | 01:15 |
| poolie | spiv, i have a branch outstanding that removes lots of old code | 01:28 |
| poolie | i have review comments from robert still to do | 01:28 |
| === ampelbein is now known as Ampelbein | ||
| jam | lifeless: streaming or the change to the delta_index code? | 02:16 |
| abentley | thumper: pong | 02:19 |
| thumper | abentley: I was wanting to talk to you about the bzr sprint at uds | 02:20 |
| abentley | thumper: sure thing. | 02:20 |
| abentley | thumper: did you mean on skype? | 02:21 |
| thumper | abentley: :) yes | 02:22 |
| * igc lunch | 02:31 | |
| === abentley1 is now known as abentley | ||
| lifeless | jam: both | 03:13 |
| === abentley1 is now known as abentley | ||
| === Ampelbein is now known as ampelbein | ||
| thumper | poolie: what do we need to do to kick the backport effort in ubuntu? | 04:24 |
| poolie | james_w said something in bne about driving it | 04:26 |
| poolie | but he's on holiday until monday | 04:27 |
| thumper | bne? | 04:27 |
| thumper | nm | 04:27 |
| thumper | friday afternoon and I'm knackered | 04:27 |
| igc | content filtering patch submitted to pqm | 04:29 |
| * igc off to hospital for the rest of the day | 04:29 | |
| igc | have a good weekend all | 04:29 |
| lifeless | igc: good luck | 04:36 |
| maco | bzr push needs some better error messages | 04:38 |
| maco | "bzr push lp:~maco.m/seahorse-plugins" tells me that ~maco.m isnt a valid project name instead of telling me i need a branch name on the end of it | 04:39 |
| maco | maybe this is launchpad-specific though....? should i bug them instead? | 04:39 |
| lifeless | maco: its launchpad specific | 04:44 |
| maco | ok ill go bug them | 04:44 |
| lifeless | :) | 04:44 |
| poolie | idea: | 06:06 |
| poolie | maybe we could take all these people who like bikeshedding | 06:07 |
| poolie | and rent them out to actual power plants that need their bikesheds painted? | 06:07 |
| poolie | strictly one per shed | 06:07 |
| lifeless | hopefully with big bikesheds | 06:07 |
| poolie | mm | 06:08 |
| === r0bby_ is now known as r0bby | ||
| poolie | kfogel: don't you sleep? :) | 06:50 |
| kfogel | poolie: long story :-) | 06:51 |
| kfogel | poolie: I'm actually an early-to-bed person, but... sigh, something came up, so here I ma. | 06:51 |
| kfogel | am | 06:51 |
| vila | hi all | 06:56 |
| kfogel | hi vila | 06:56 |
| poolie | hello vila | 06:57 |
| poolie | readjusted to europe? | 06:58 |
| vila | poolie: fully :-) | 06:58 |
| vila | I even add a ~2hours protest under my windows yesterday :) | 06:58 |
| vila | s/add/had/ | 06:59 |
| vila | not specifically targeted at me of course... | 06:59 |
| poolie | heh | 07:00 |
| poolie | not even at slow push to 1.13? :) | 07:00 |
| vila | not even :-) But some wanted a faster selftest though... :-P | 07:01 |
| lifeless | vila: you begged :P | 07:01 |
| lifeless | vila: and we have now | 07:01 |
| vila | lifeless: it rocks ! I toyed a bit yesterday evening trying to spawn 256/2048 processes instead of just 8 and obvisouly the kernel just can't handle that (I have plenty of memory so no problem from that side) | 07:02 |
| lifeless | vila: :P | 07:03 |
| lifeless | vila: its fixable | 07:03 |
| vila | lol | 07:03 |
| Peng_ | Possibly stupid question: How does doing BzrDir.find_branches() on a local transport wind up returning remote branches? | 07:03 |
| lifeless | its just in the wrong spot, the ec2 version has it moved to run() | 07:03 |
| lifeless | Peng_: branch references | 07:03 |
| vila | lifeless: spawning the processes you mean ? | 07:04 |
| lifeless | yes | 07:04 |
| Peng_ | lifeless: Okay. | 07:04 |
| Peng_ | I wonder where I have one of those? | 07:04 |
| Peng_ | Oh, I remember. | 07:04 |
| vila | lifeless: diff available somewhere ? | 07:04 |
| lifeless | vila: no :P but the branch I put up has a new snapshot | 07:05 |
| lifeless | vila: remember that none of this history will be merged, its all noise - I'm cutting and pasting bits for the relevant projects | 07:05 |
| lifeless | poolie: 7m30 or so with 5 instances | 07:08 |
| lifeless | though there are still, uhm, glitches | 07:08 |
| vila | lifeless: branch url ? And yes, I understand we don't care about history (though I'm a bit surprised we make an exception there ;-P) | 07:10 |
| lifeless | tests.parallel | 07:10 |
| vila | lifeless: got it | 07:12 |
| poolie | Peng_, would you be interested in coming to this bzr sprint at all? | 07:12 |
| poolie | robert suggested at least putting you on the list | 07:12 |
| vila | lifeless: wow, of course I should ignore all that ec2 related stuff | 07:14 |
| vila | lifeless: I'll manage, back to test_breakin | 07:15 |
| poolie | ok, i think that's enough | 07:17 |
| lifeless | ciao | 07:20 |
| vila | have a nice week-end ! | 07:21 |
| Coke | Hi! Odd question perhaps, are there any free project hosting for free projects (like launchpad) that use bzr? | 07:25 |
| Coke | (except launchpad, ofcourse) | 07:25 |
| cody-somerville | Sourceforge.net | 07:26 |
| luks | sourceforge, savannah, any web hosting | 07:26 |
| Coke | They do? | 07:26 |
| Coke | Savannah is using bzr these days? | 07:26 |
| mrooney | hmm is this an important error? bzr: ERROR (ignored): The medium '<bzrlib.smart.medium.SmartSSHClientMedium object at 0x9d71d2c>' has reached its concurrent request limit. Be sure to finish_writing and finish_reading on the currently open request. | 07:30 |
| mrooney | I can't seem to get through this push, it just stalls at walking content, though if I control+c that is what I get | 07:30 |
| poolie | mrooney: it's typically a knock-on effect of some other error | 07:30 |
| poolie | it's better in later versions | 07:31 |
| poolie | cheerio | 07:31 |
| mrooney | poolie: how many later versions are there than 1.13~rc1-1build1 ?! | 07:31 |
| poolie | not many :) | 07:31 |
| mrooney | hm I can't seem to push, alas | 07:31 |
| mrooney | it just sticks on walking content | 07:32 |
| poolie | mrooney: if it's reproducible please do control-backslash | 07:32 |
| poolie | which should put you in a debugger then type 'bt' | 07:32 |
| mrooney | yes it does seem to be | 07:32 |
| poolie | and then put that in a bug and show vila :) | 07:32 |
| poolie | cause unfortunately i have to go | 07:33 |
| mrooney | hm okay well here it is for any other eyes http://paste2.org/p/167921 | 07:33 |
| mrooney | I really need to go also | 07:33 |
| mrooney | I just wanted to push this code so someone else could work on it | 07:33 |
| mrooney | I guess not :/ | 07:33 |
| vila | poolie: lol | 07:33 |
| vila | mrooney: looking | 07:33 |
| mrooney | vila: thanks :) | 07:33 |
| vila | mrooney: ok, so, hpss requests shouldn't interrupted as they don't know how to restart, instead you should use -Dhpss and look at .bzr.log | 07:34 |
| vila | you can even add 'debug_flags = hpss' in bazaar.conf | 07:36 |
| mrooney | it will always just get stuck at some random walking content number | 07:36 |
| vila | mrooney: we need to look at that 'random' :-) | 07:36 |
| vila | but first, | 07:36 |
| mrooney | so where should that log be? | 07:37 |
| vila | where are you pushing to ? What format is used there, are you stacking ? | 07:37 |
| mrooney | I have no idea :) I just tried to push to a fresh branch | 07:37 |
| mrooney | "bzr push lp:~mrooney/do-plugins/skreemr-plugin" | 07:37 |
| vila | mrooney: 'bzr version' will tell you where the .bzr.log file resides | 07:37 |
| Coke | Hey, I can't find any evidence at all that sourceforge or savannah is using bazaar, any link to docs explaining how to use it? | 07:39 |
| mrooney | vila: http://paste2.org/p/167923 | 07:40 |
| mrooney | the top part is the .bzr.log part, the bottom is where I am stuck | 07:40 |
| bob2 | http://bzr.savannah.gnu.org/ | 07:40 |
| vila | mrooney: wow, wow, what bzr version are you using ? | 07:40 |
| bob2 | for small values of using | 07:40 |
| mrooney | yes indeed | 07:40 |
| mrooney | 1.13~rc1-1build1 | 07:41 |
| Coke | There's nothing in the user guide nor http://savannah.gnu.org/userguide/ | 07:41 |
| mrooney | jaunty | 07:41 |
| Coke | and the faq is lacking bzr commentary | 07:41 |
| Peng_ | You think it's a good idea to set public_branch on all of your, well, public branches on the server? | 07:42 |
| vila | mrooney: What 'bzr info -v' shows in your local branch ? | 07:42 |
| Coke | The menus include git, cvs, svn and arch, no bzr | 07:42 |
| Peng_ | It's a bit redundant.. | 07:42 |
| mrooney | vila: http://paste2.org/p/167924 | 07:43 |
| mrooney | vila: thanks for helping me with this by the way :) | 07:43 |
| mrooney | hopefully I can get this up | 07:43 |
| vila | mrooney: hmm, assuming you put 'debug_flags = hpss' in bazaar.conf, can you try deleting the branch and pushing again ? | 07:46 |
| mrooney | oh I didn't let me do that | 07:46 |
| vila | mrooney: I suspect a stacking problem but upgrading all do-plugins branches to 1.9 may not be an option :-/ | 07:47 |
| vila | mrooney: I can't parse "I didn't let me do that", surely you can be gentle with you and authorize yourself to delete a branch no ? ;-P | 07:48 |
| mrooney | haha | 07:48 |
| mrooney | "I didn't, let me do that" | 07:48 |
| mrooney | now I am getting tons of output in the log | 07:48 |
| mrooney | after doing that | 07:48 |
| mrooney | vila: http://paste2.org/p/167927 | 07:50 |
| mrooney | it does that forever on and on | 07:50 |
| vila | mrooney: on purpose, that's a known bug, you're using a slow code path :-( | 07:51 |
| vila | for excessive values of slow :( | 07:51 |
| mrooney | vila: how long will it take? | 07:51 |
| vila | mrooney: the main factor is your ping time for lp, with ~20ms I found it hardly tolerable, above that, well, it depends on whether you are patient or very patient :-/ | 07:53 |
| mrooney | ~170 on average here | 07:53 |
| mrooney | (bazaaar.launchpad.net) | 07:53 |
| vila | I think lifeless just posted a patch against bzr.dev to address situations like yours (and spiv already posted one for some of them last week), it's definitively high on the list to have that bug fixed | 07:54 |
| mrooney | so what is my situation though | 07:54 |
| mrooney | all I did was branch from lp and push | 07:54 |
| mrooney | what is special about it? | 07:54 |
| vila | mrooney: nothing, that's the bug :) | 07:55 |
| mrooney | hm okay haha | 07:55 |
| mrooney | I'll guess I'll burn through some kilowatts and leave my computer on overnight | 07:55 |
| vila | mrooney: hmm, just checked, lifeless patch hasn't landed yet | 07:56 |
| vila | mrooney: if that's an option, go for it and let us know how it ends up :-/ | 07:56 |
| mrooney | eh I guess I will try pushing tomorrow at work on a better connection | 07:56 |
| vila | mrooney: the laternative will be to update all the do-plugins branches to format 1.9 which doesn't suffer from this bug | 07:57 |
| mrooney | but I have 1Mb up, I guess the ping is bad | 07:57 |
| mrooney | how do I do that? | 07:57 |
| vila | 'bzr upgrade lp:do-plugins --format 1.9' for all branches | 07:57 |
| mrooney | can I do it on just mine? | 07:58 |
| vila | mrooney: possibly, but if stacking is enabled on lp for do-plugins, I'm not sure this will avoid the bug... It may be faster to try though | 07:59 |
| mrooney | it will be faster to give up and sleep | 07:59 |
| mrooney | :) | 07:59 |
| mrooney | thanks for your help though | 07:59 |
| vila | mrooney: sure, sorry about that :-/ | 07:59 |
| mrooney | I will hope this magically works tomorrow or something | 07:59 |
| vila | mrooney: things should be better once the initial push suceeds... | 08:02 |
| mrooney | all I need is the initial push :) | 08:02 |
| mrooney | it is only for review so it can be merged haha | 08:02 |
| mrooney | as I don't have permission to push elsewhere | 08:02 |
| vila | mrooney: hmm, looks like lifeless patch landed after all (BB didn't acknowledged it yet, but it's in bzr.dev), so you may want to try that too (please report if you do) | 08:04 |
| mrooney | bzr: 1 me: 0 | 08:05 |
| mrooney | I'll try to even the score tomorrow :) | 08:05 |
| mrooney | good night thanks for your help! | 08:05 |
| vila | mrooney: you're welcome | 08:05 |
| mrooney | ps I upgraded the remote branch and my local although it didn't seem to fix it, I suppose your stacking suspicion was correct | 08:06 |
| vila | mrooney: which remote one ? | 08:07 |
| mrooney | ~mrooney/do-plugins/skreemr-plugin | 08:07 |
| mrooney | the unpushed to one | 08:07 |
| mrooney | I don't know if that actually does anything but it took about 10 minutes so I presume it does | 08:08 |
| vila | I'm surprised you can update it if it's not pushed to yet... what does .bzr.log says ? | 08:08 |
| mrooney | vila: http://paste2.org/p/167940 | 08:10 |
| mrooney | apparently it took only 3 minutes | 08:10 |
| vila | mrooney: hmm, sounds good, what does bzr push reports now ? | 08:10 |
| mrooney | still hanging out at walking content | 08:11 |
| mrooney | last thing in the log there is 8.569 fetch up to rev {mrooney@ubuntu.com-20090320073443-2g8kssdqgnwhyfnw} | 08:11 |
| vila | well, so indeed, you may need bzr.dev (sorry about the trials, I don't have all the combinations clearly in head) | 08:12 |
| Peng_ | Another possibly-stupid question: What if I want to read from a branch and conditionally write to it? Should I always take out a write lock? Can I take out a read lock and "upgrade" it to a write lock if necessary? | 08:13 |
| * Peng_ wonders why downloading the most recent revision of bzr.dev over http took 1.5 minutes and ~3.7 MB of bandwidth | 09:35 | |
| Peng_ | It's 14 lines of changes! | 09:35 |
| LarstiQ | beuno: https://edge.launchpad.net/%7Ebzr-beta-ppa/+archive/ppa/+sourcepub/530792/+listing-archive-extra | 10:07 |
| LarstiQ | jam: thanks, uploaded | 10:45 |
| beuno | LarstiQ, hi. So I should install bzr-svn from that PPA? | 13:30 |
| pygi | hi hi | 13:32 |
| LarstiQ | beuno: either that or download the deb from there | 13:34 |
| === ampelbein is now known as Ampelbein | ||
| === Ampelbein is now known as ampelbein | ||
| === ampelbein is now known as goodkarma | ||
| === goodkarma is now known as Ampelbein | ||
| beuno | LarstiQ, installing bzr-svn works great | 14:50 |
| beuno | would you like me to use it in any way? | 14:50 |
| === nevans1 is now known as nevans | ||
| mxpxpod | I just shelved some changes using bzr 1.13 which included adding some files and now when it goes to unshelve them it gives me this error: bzr: ERROR: No such file: None | 15:12 |
| mxpxpod | any way to fix that? | 15:13 |
| === Ampelbein is now known as ampelbein | ||
| LarstiQ | beuno: I wouldn't object to that :) I'm reasonably sure that if it gets through the phase where debian/control matters, that the actual code itself works. | 15:23 |
| beuno | LarstiQ, so I should just try and check out an svn branch with bzr? | 15:24 |
| beuno | got any handy? :) | 15:24 |
| mxpxpod | beuno: http://svn.dojotoolkit.org/src/dojo/trunk | 15:25 |
| LarstiQ | beuno: stolen from subvertpy examples: svn://svn.gnome.org/svn/gnome-specimen/trunk | 15:25 |
| beuno | fetching.... | 15:27 |
| mxpxpod | so, does anyone know what's going on with bzr unshelve? | 15:27 |
| beuno | malbisetti@pentaserv:~$ bzr co svn://svn.gnome.org/svn/gnome-specimen/trunk test_svn | 15:27 |
| beuno | Initialising Subversion metadata cache in /home/malbisetti/.bazaar/svn-cache/203ae883-c723-44c9-aabd-cb56e4f81c9a | 15:27 |
| beuno | Upgrade to Subversion 1.5 or higher for faster retrieving of revision properties. | 15:27 |
| beuno | mxpxpod, maybe you're mixing shelve and shelve2? | 15:27 |
| LarstiQ | mxpxpod: in what sense? | 15:27 |
| LarstiQ | ah, you pasted something above | 15:28 |
| mxpxpod | :) | 15:28 |
| mxpxpod | beuno: nope, I did bzr shelve and then bzr unshelve | 15:28 |
| LarstiQ | mxpxpod: doesn't look familiar to me, did you check the bugs page in launchpad? | 15:28 |
| mxpxpod | yeah, looking now | 15:28 |
| mxpxpod | I could swear I've seen this before... but I don't remember the fix | 15:29 |
| LarstiQ | mxpxpod: there have been various shelve fixes the past releases | 15:29 |
| mxpxpod | LarstiQ: yeah, I figured... I'm using 1.13 | 15:30 |
| mxpxpod | and I need these files :( | 15:31 |
| LarstiQ | mxpxpod: so if you trigger something in 1.13, either it's something new, something regressed, or newly exposed | 15:31 |
| mxpxpod | frick | 15:31 |
| LarstiQ | mxpxpod: we should be able to help you get your files back | 15:31 |
| LarstiQ | mxpxpod: but it would be easier if this was a known problem | 15:32 |
| mxpxpod | LarstiQ: fun ;) | 15:32 |
| mxpxpod | the other problem is that I can't give out the shelf file because the files are internal to my company | 15:33 |
| LarstiQ | that's fine | 15:33 |
| mxpxpod | do you want me to paste the bzr log somewhere? | 15:33 |
| beuno | LarstiQ, worked like a charm | 15:34 |
| mxpxpod | LarstiQ: oh, the other thing is that I added a new directory to the shelf too | 15:35 |
| mxpxpod | and there was a file in that directory | 15:35 |
| mxpxpod | LarstiQ: hmm, it might be trying to add the file in the directory before adding the directory back | 15:36 |
| jam | morning vila (I have a conference call right now, but we can chat after if you want) | 15:38 |
| vila | jam: chat sounds good | 15:38 |
| mxpxpod | LarstiQ: it's dying in line 546 of bzrlib/transform.py | 15:39 |
| mxpxpod | LarstiQ: any clues? | 15:45 |
| LarstiQ | mxpxpod: sorry, irl sidetracked me for a moment there | 15:53 |
| LarstiQ | mxpxpod: your analysis sounds plausible | 15:53 |
| LarstiQ | mxpxpod: with that sequence I get a different message | 15:55 |
| LarstiQ | mxpxpod: could you cp -a your branch so we can look at the state as it was later again? | 15:56 |
| mxpxpod | LarstiQ: huh? | 15:56 |
| LarstiQ | mxpxpod: .bzr/checkout/shelf is where shelf has stored your files | 15:56 |
| LarstiQ | mxpxpod: I'm intending to get your file out first, and do bugreporting later | 15:57 |
| jam | vila: call has completed if you want to chat | 15:58 |
| mxpxpod | LarstiQ: ok, so do you want a copy of my branch? | 15:58 |
| vila | jam: sure | 15:59 |
| LarstiQ | mxpxpod: no, I just want to make sure you have an extra copy that we're not going to touch | 15:59 |
| mxpxpod | LarstiQ: or, just for me to make a copy for later | 15:59 |
| mxpxpod | LarstiQ: gotcha | 15:59 |
| mxpxpod | LarstiQ: making the copy now | 16:01 |
| mxpxpod | LarstiQ: ok, done | 16:05 |
| LarstiQ | mxpxpod: ok, `bzr shelve --list` only shows 1 shelve? | 16:06 |
| mxpxpod | LarstiQ: yessir | 16:06 |
| mxpxpod | and there's only one file in .bzr/checkout/shelf | 16:07 |
| LarstiQ | mxpxpod: if you open that with an editor, do you see the contents of your file clearly? | 16:09 |
| mxpxpod | LarstiQ: yeah | 16:09 |
| mxpxpod | LarstiQ: but there are other changes in the file | 16:09 |
| durin42 | jelmer: ping, can we bug you in #mercurial briefly? | 16:09 |
| mthaddon | has bzr merge --force changed somehow in 1.13? | 16:14 |
| mxpxpod | LarstiQ: I guess I'll just have to apply all of those changes manually | 16:16 |
| LarstiQ | mxpxpod: ok, let me try a couple of things | 16:16 |
| jelmer | durin42: sure | 16:50 |
| jam | BasicOSX: ping | 16:56 |
| BasicOSX | jam: hiyah | 16:58 |
| jam | hey, just checking the 1.13.1 release | 16:59 |
| jam | It looks like you don't have the fix for the "bzr merge --force" regressino | 16:59 |
| jam | which was an issue for some other people | 16:59 |
| jam | Do you might getting that into 1.13.1 before we make it finalized? | 16:59 |
| BasicOSX | sec | 16:59 |
| jpds | Anyone else having troulbe pushing to lp? | 17:00 |
| jam | BasicOSX: "bzr.dev 4146" I'm happy to create a cherrypick and submit it to PQM as long as you are signed off on it | 17:01 |
| BasicOSX | jam: I can squeeze it in :-) Looks like Vincent fixed my bzrtools bug | 17:02 |
| BasicOSX | so I was going to re-start the release as well | 17:02 |
| BasicOSX | cherry pick and PQM to the branch, I'll sign off on it | 17:02 |
| jam | k | 17:02 |
| BasicOSX | Eeep! I missed 1.14rc1 -and- 1.14final according to mbp post! | 17:05 |
| jam | jpds: it seems to be working for me | 17:06 |
| jam | did you try again? | 17:06 |
| jam | BasicOSX: yep. though if you read further he really did mean April :) | 17:07 |
| BasicOSX | I know, was just putting it in irc to tease | 17:07 |
| fullermd | Shucks. There I was thinking I'd finally gotten a good, long sleep... | 17:08 |
| jpds | jam: Just made it. | 17:10 |
| jam | BasicOSX: change is on its way to PQM now | 17:10 |
| jam | Shall I ping you when I get the confirmation? | 17:10 |
| BasicOSX | My lunch hour almost over, drop me email on it? | 17:10 |
| BasicOSX | since I'm going to loose wifi when I leave the cafe and drop back to the office :-) (yes, I bring my laptop to lunch) | 17:11 |
| Tak | can an uncommit be pushed to other branches? | 17:12 |
| jam | Tak: with 'bzr push --overwrite' | 17:12 |
| vila | jam, BasicOSX : SHouldn't revno 4174 (bug #345169) be included in 1.13.1, it seems to address some pushing-to-lp-is-slooow bugs that some early 1.13.1 are experiencing | 17:13 |
| ubottu | Launchpad bug 345169 in bzr "bzr push to a new lp branch of bzr from a local copy fails to stack" [Critical,New] https://launchpad.net/bugs/345169 | 17:13 |
| Tak | then what happens if I pull from a branch that already has the revision as well? | 17:13 |
| jam | vila: it isn't a regression | 17:13 |
| jam | "source is 0.92 branch 7" | 17:14 |
| BasicOSX | vila: I asked on the ... nm, jam answering | 17:14 |
| vila | I know :-/ | 17:14 |
| jam | vila: not worthy of a 1.13.1 release | 17:14 |
| jam | they would get the same from 1.12 | 17:14 |
| jam | Tak: uncommit just rolls the pointer back, it doesn't mark it as rejected | 17:14 |
| jam | so pulling from a branch that had it will bring it back | 17:14 |
| Tak | so what I really want is to unmerge that revision | 17:15 |
| jam | Tak: bzr revert -r -2; bzr commit | 17:15 |
| jam | bzr merge -r X..X-1 ; bzr commit | 17:15 |
| jam | sorry | 17:15 |
| jam | bzr merge . -r X..X-1 ; bzr commit | 17:15 |
| jam | depending on whether you want to reject the last commit, or something older | 17:16 |
| jam | (merge works in both cases, but revert is more obvious, IMO) | 17:16 |
| * Tak nods | 17:16 | |
| Tak | thanks | 17:16 |
| d6g | hello, i have some problem to push to a branch today, it stops at | 17:20 |
| d6g | [| ] Transferring:Walking content. 1294/1423 | 17:20 |
| d6g | and when i stop it using ctrl-c, i got this error: http://paste.pocoo.org/show/108824/ | 17:20 |
| jam | d6g: I don't think it stopped, it is still transferring, just not giving progress messages. | 17:21 |
| jam | This would be with at least bzr1.13 to another bzr.1.13 host, right? | 17:21 |
| d6g | it's 1.3 and push to launchpad | 17:21 |
| d6g | 1.13 | 17:22 |
| jam | bzr.dev is a little better in that you still get 'activity' indications on the bytes sent/received. | 17:22 |
| d6g | but how long am i supposed to wait, it seems just stuck in there | 17:22 |
| d6g | and the number 1294 seems random, sometimes larger/smaller | 17:22 |
| d6g | jam: i think you are right, i saw the upload speed now, it still is around 50kb/s, so i will probably have to wait, thx. | 17:24 |
| mrooney | vila: no more apparent luck today, hm | 17:40 |
| awilkins | So, if I used --stacked on a branch that doesn't support stacking, how well does it work? | 18:04 |
| awilkins | It's currently telling me it's using 1.6, inside a 1.9 repo, and it's doing stuff that I presume is stacking (building tree") | 18:05 |
| === ampelbein is now known as Ampelbein | ||
| === abentley1 is now known as abentley | ||
| === Ampelbein is now known as ampelbein | ||
| === ampelbein is now known as Ampelbein | ||
| nekohayo | hey there, I'm getting a "Permission denied (publickey)." when trying to "bzr pull lp:~kiddo/specto/specto-jeff" .... what's up? | 20:21 |
| nekohayo | using bazaar 1.6 "bundled with intrepid" | 20:21 |
| smoothice | Does anyone know if bazaar version 1.5.0 supports Launchpad? | 20:23 |
| asabil | nekohayo: probably logged in, and bzr pull lp:... tries to use bzr+ssh | 20:24 |
| nekohayo | for a pull? | 20:25 |
| nekohayo | but then I still have no idea what to do in that case | 20:25 |
| asabil | bzr launchpad-login | 20:26 |
| === Ampelbein is now known as ampelbein | ||
| jelmer | abentley: hi | 20:58 |
| abentley | jelmer: hi | 20:58 |
| jelmer | abentley: What could cause a "Revision incompatible" error while merging a bundle? | 20:58 |
| abentley | jelmer: I guess going from rich-root to non-rich-root? | 20:59 |
| jelmer | abentley: that was it, thanks! | 21:07 |
| nekohayo | asabil: returns "kiddo" | 21:10 |
| nekohayo | asabil: nevermind, I upgraded to bzr 1.13 and that fixed it | 21:18 |
| hsn_ | how can i get around error message from apt-get public key is not available when i am trying to access bzr repos? | 21:19 |
| beuno | hsn_, | 21:20 |
| beuno | https://edge.launchpad.net/~bzr/+archive/ppa | 21:20 |
| beuno | https://help.launchpad.net/Packaging/PPA#Adding%20a%20PPA%20to%20your%20Ubuntu%20repositories | 21:20 |
| hsn_ | beuno: thank you it works now | 21:25 |
| exarkun | How do I change the push branch of a working copy that already has one? | 21:50 |
| fullermd | push --remember | 21:51 |
| exarkun | With version 1.3.1 that doesn't seem to do it | 21:51 |
| exarkun | Oh :( | 21:51 |
| exarkun | Yes it does, I just have a comprehension problem. | 21:52 |
| exarkun | Thanks | 21:52 |
| fullermd | Coffee helps with that ;) | 21:52 |
| exarkun | Hmm yea.... | 21:52 |
| === abentley1 is now known as abentley | ||
| lifeless | vila: hi | 23:39 |
| lifeless | vila: do you have a copy of tests.parallel with both our stuff in it? | 23:39 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!