[05:02] hi jelmer [05:06] Question: How do I on Win upload to my Launchpad PPA? [05:41] How do I set my SSH keys with bazzar explorer? [05:42] benonsoftware: I believe you must use pagent (part of putty) - at least that's how I do it. [05:43] 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] oh, I assumed you were using windows, based on your previous question. [05:44] thomi: I am that is what I get [05:45] what ssh program are you using? [05:46] thomi: pagent [05:48] thomi: I am not sure what is happening with it [05:52] benonsoftware: it's a bit old, but perhaps this might help you? https://answers.launchpad.net/bzr/+question/50360 === fredp_ is now known as fredp [07:14] jelmer, hey> === Mkaysi_ is now known as Mkaysi === nyuszika7h is now known as I_had_gun === I_had_gun is now known as nyuszika7h [17:45] can i somehow make bzr automatically check out the latest version of the branch? [17:47] what other version of the branch would it check out? [17:48] sorry, i meant: [17:48] can i somehow make bzr automatically update to the latest version of the branch? [17:49] Like "bzr pull"? [17:49] yeah [17:49] or more like bzr up [17:49] i commit to branch from my workstation, and want the server to automatically see it and update to the latest version. [17:50] or i commit to the main branch from a checkout, or something. [17:51] 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] I don't know, maybe there's a plugin or something. [18:13] exarkun, i think it just needs to be something that runs "bzr up" every 10 seconds [18:13] i could do a cron job.. but i thought maybe there's some better way to do it [18:13] Sure, but you don't need #bzr to tell you that. [18:14] yeah [18:14] i thought, maybe there's some sort of, uh, trigger or something. [18:14] there are always those triggers for everything! [18:14] i guess that's mostly wishful thinking though :) [20:58] hi jelmer [21:08] hi Noldorin [21:10] jelmer, was about to do some testing yesterday but ran into problems [21:10] jelmer, bzr is telling me "working tree is out of date" and i have no idea why [21:16] Noldorin: when is it telling you that? [21:16] jelmer, bzr st, bzr dpush, bzr most things :-) [21:16] Noldorin: is this after you hit the bug you were debugging? [21:16] Noldorin, or on a different branch? [21:16] jelmer, same branch [21:16] i just uncommited to r -46 [21:16] err [21:17] -r 46 [21:17] so i cna investigate [21:17] Noldorin, right, so that's probably because it crashed halfway through [21:17] Noldorin, "bzr up" should get the working tree up to date again [21:17] i see [21:17] jelmer, many many conflicts now [21:22] jelmer, ok fixed....somehow! :-) [21:22] jelmer, will investigate which directories cause the issue later === yofel_ is now known as yofel === med_out is now known as medberry [23:45] I had an weird merge problem, I deleted all branches but it was like this [23:47] 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] 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] 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] are these two normal problems of merging or bugs?