[01:09] <obst> hi! If I got a revision 1, 2 and 3, is it possible to remove the changes introduced in revision 2 without affecting rev 1 and 3?
[01:11] <lifeless> bzr merge . -r 3..2 && bzr commit -m "backout commit 2"
[01:17] <obst> it removed the changes from third revision not from the second
[01:17] <lifeless> sorry
[01:17] <lifeless> 2..1
[01:17] <lifeless> :P
[01:17] <lifeless> just uncommit and revert to get back to where you were before my recipe
[01:24] <obst> hehe
[01:26] <obst> lifeless, this generates a conflict and still seems not to be what I want: http://pastebin.com/d3a215904
[01:29] <lifeless> looks like you changed the seond revision line in rev 3 as well
[01:29] <lifeless> or something like that
[01:29] <lifeless> it does, in general, work
[01:39] <obst> here is a better example, I cant get it to work: http://pastebin.com/d44722d64
[01:43] <lifeless> http://pastebin.com/d2c0e4857
[01:43] <lifeless> write that to e.g. demo.sh
[01:43] <lifeless> and run it
[01:54] <obst> hah! that works, but when I try to nearly the same it generates conflicts
[01:56] <obst> but Im now confident thet it will work in general, thank you!
[17:06] <blueyed> If I add a file in a branch and later add the same file to the parent branch/trunk and merge from there, I'll get a "Contents conflict". Is that expected? IIRC I have to "bzr rm" the file in the branch and "bzr mv foo{.OTHER,}", right?
[17:09] <jelmer> blueyed: yes
[17:09] <jelmer> blueyed: the files have a different identity
[17:09] <jelmer> blueyed: also see "bzr ls --show-ids"
[17:10] <jelmer> if you add them with the same file id they won't conflict
[17:13] <blueyed> jelmer: thanks. Well they got added to the trunk already.. the "--file-ids-from" option is new to me, but would not have helped, since trunk gets auto-converted from CVS. I guess it's not possible to fumble with the file-id in the current state? It's not really an issue, but thanks for explaining it to me.
[17:20] <jelmer> blueyed: no, it's not currently possible to do anything about that
[17:20] <jelmer> I hope we can come up with a solution to that problem ("parallel imports" is what it's usually called) at the next sprint
[20:37] <OllieR> Hey I am setting up a bzr repo for my personal and public projects. Private will only be read/writtable by myself by public will be readable over web (served by apache) at writtable by certain other people. What is the process for setting up bzr permissions. Is it just a case of setting up users/groups as required. Will I have any problems if i do the bzr init-repo using my own account?
[20:37] <OllieR> there seems to be a lack of documentation around
[21:18] <pygi> OllieR, can you run a custom daemon or is that too much to ask? :)
[21:18] <OllieR> pygi: please elaborate..
[21:19] <pygi> OllieR, do you have powers oj
[21:19] <pygi> on the server to run a daemon?
[21:19] <OllieR> powers oj, you mean root?
[21:19] <OllieR> it is my server I have full control...
[21:19] <pygi> well, actually no :P Any home account will do :)
[21:20] <OllieR> ok so what are you suggesting?
[21:20] <pygi> ok, moment :)
[21:20] <OllieR> ok col
[21:20] <pygi> OllieR, http://projects.serverzen.com/pm/p/cluemapper/wiki/ClueBzrServer
[21:21] <pygi> OllieR, note: bzr 1.12, it doesn't work with 1.13
[21:22] <pygi> (on server side)
[21:22] <OllieR> ok interesting idea
[21:22] <pygi> Its still a bit rough, but I'm on it
[21:22] <OllieR> is this your brainchild?
[21:22] <pygi> nop
[21:23] <pygi> but since its not really maintained properly, I talked with the creator about some things I want to do, and I'll change quite some things in there
[21:23] <OllieR> interestante
[21:23] <pygi> first things first, I don't like its security aspect
[21:23] <pygi> it needs to be more flexible =)
[21:28] <OllieR> good luck with it looks interesting
[21:34] <pygi> OllieR, looking at it like this, do you have any feature requests? :)
[21:34] <OllieR> support for 1.13 :)
[21:34] <pygi> ha!
[21:34] <pygi> indeed :p
[22:43] <a_c_m1> i have a head checkout thats lost its .bzr folder, what the simplest clean way to make it back into a back into a branch - the added complication is it has local changes
[22:51] <xnevermore> Hey. I want to use bzr for my web projects. I'm using bzr-upload for deployment. However, I don't want to have to do an upload every time I want to test out my changes. I thought the best solution would be to have a small testing webserver (with php support) to run in my working tree (the same way rails projects have webrick or mongrel).
[22:51] <xnevermore> Does anyone have any ideas?
[22:51] <lifeless> that sounds fine
[22:52] <xnevermore> any ideas for a small webserver to use?
[22:52] <lifeless> apache?
[22:53] <xnevermore> that seems a little overkill for my purposes