[05:02] <Noldorin> hi jelmer
[05:06] <benonsoftware> Question: How do I on Win upload to my Launchpad PPA?
[05:41] <benonsoftware> How do I set my SSH keys with bazzar explorer?
[05:42] <thomi> benonsoftware: I believe you must use pagent (part of putty) - at least that's how I do it.
[05:43] <benonsoftware> thomi: I have my private and public keys in .ssh and I get bzr: ERROR: Don't know how to handle SSH connections. Please set BZR_SSH environment variable.
[05:44] <thomi> oh, I assumed you were using windows, based on your previous question.
[05:44] <benonsoftware> thomi: I am that is what I get
[05:45] <thomi> what ssh program are you using?
[05:46] <benonsoftware> thomi: pagent
[05:48] <benonsoftware> thomi: I am not sure what is happening with it
[05:52] <thomi> benonsoftware: it's a bit old, but perhaps this might help you? https://answers.launchpad.net/bzr/+question/50360
[07:14] <Noldorin> jelmer, hey>
[17:45] <cheater__> can i somehow make bzr automatically check out the latest version of the branch?
[17:47] <exarkun> what other version of the branch would it check out?
[17:48] <cheater__> sorry, i meant:
[17:48] <cheater__> can i somehow make bzr automatically update to the latest version of the branch?
[17:49] <exarkun> Like "bzr pull"?
[17:49] <cheater__> yeah
[17:49] <cheater__> or more like bzr up
[17:49] <cheater__> i commit to branch from my workstation, and want the server to automatically see it and update to the latest version.
[17:50] <cheater__> or i commit to the main branch from a checkout, or something.
[17:51] <exarkun> So you want to automatically update an arbitrary checkout, somewhere in the world, when a new revisions appears in a another checkout of that branch somewhere else in the world.
[17:51] <exarkun> I don't know, maybe there's a plugin or something.
[18:13] <cheater__> exarkun, i think it just needs to be something that runs "bzr up" every 10 seconds
[18:13] <cheater__> i could do a cron job.. but i thought maybe there's some better way to do it
[18:13] <exarkun> Sure, but you don't need #bzr to tell you that.
[18:14] <cheater__> yeah
[18:14] <cheater__> i thought, maybe there's some sort of, uh, trigger or something.
[18:14] <cheater__> there are always those triggers for everything!
[18:14] <cheater__> i guess that's mostly wishful thinking though :)
[20:58] <Noldorin> hi jelmer
[21:08] <jelmer> hi Noldorin
[21:10] <Noldorin> jelmer, was about to do some testing yesterday but ran into problems
[21:10] <Noldorin> jelmer, bzr is telling me "working tree is out of date" and i have no idea why
[21:16] <jelmer> Noldorin: when is it telling you that?
[21:16] <Noldorin> jelmer, bzr st, bzr dpush, bzr most things :-)
[21:16] <jelmer> Noldorin: is this after you hit the bug you were debugging?
[21:16] <jelmer> Noldorin, or on a different branch?
[21:16] <Noldorin> jelmer, same branch
[21:16] <Noldorin> i just uncommited to r -46
[21:16] <Noldorin> err
[21:17] <Noldorin> -r 46
[21:17] <Noldorin> so i cna investigate
[21:17] <jelmer> Noldorin, right, so that's probably because it crashed halfway through
[21:17] <jelmer> Noldorin, "bzr up" should get the working tree up to date again
[21:17] <Noldorin> i see
[21:17] <Noldorin> jelmer, many many conflicts now
[21:22] <Noldorin> jelmer, ok fixed....somehow! :-)
[21:22] <Noldorin> jelmer, will investigate which directories cause the issue later
[23:45] <RenatoSilva> I had an weird merge problem, I deleted all branches but it was like this
[23:47] <RenatoSilva> I have a branch which works on a feature for foobar release 1.2.3, then I created another branch and merged upstream repo changes, for getting that feature working with foobar dev version
[23:48] <RenatoSilva> 1. the merge pointed some conflicts out of order. That is, I had to figure out that if I just fixed each conflict individually from top to bottom, I'd get a completely wrong result
[23:48] <RenatoSilva> 2. the merge didn't merge one of upstream changes, it was supposed to replace some two lines with one single line from upstream
[23:49] <RenatoSilva> are these two normal problems of merging or bugs?