/srv/irclogs.ubuntu.com/2009/04/12/#bzr.txt

obsthi! 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:09
lifelessbzr merge . -r 3..2 && bzr commit -m "backout commit 2"01:11
obstit removed the changes from third revision not from the second01:17
lifelesssorry01:17
lifeless2..101:17
lifeless:P01:17
lifelessjust uncommit and revert to get back to where you were before my recipe01:17
obsthehe01:24
obstlifeless, this generates a conflict and still seems not to be what I want: http://pastebin.com/d3a21590401:26
lifelesslooks like you changed the seond revision line in rev 3 as well01:29
lifelessor something like that01:29
lifelessit does, in general, work01:29
obsthere is a better example, I cant get it to work: http://pastebin.com/d44722d6401:39
lifelesshttp://pastebin.com/d2c0e485701:43
lifelesswrite that to e.g. demo.sh01:43
lifelessand run it01:43
obsthah! that works, but when I try to nearly the same it generates conflicts01:54
obstbut Im now confident thet it will work in general, thank you!01:56
=== r0bby_ is now known as r0bby
=== bob2 is now known as Guest38835
=== maxb_ is now known as maxb
=== Guest38835 is now known as bob2
=== Leonidas_ is now known as Leonidas
=== BasicPRO is now known as BasicOSX
=== eMBee_ is now known as eMBee
blueyedIf 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:06
jelmerblueyed: yes17:09
jelmerblueyed: the files have a different identity17:09
jelmerblueyed: also see "bzr ls --show-ids"17:09
jelmerif you add them with the same file id they won't conflict17:10
blueyedjelmer: 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:13
=== abentley1 is now known as abentley
jelmerblueyed: no, it's not currently possible to do anything about that17:20
jelmerI hope we can come up with a solution to that problem ("parallel imports" is what it's usually called) at the next sprint17:20
=== abentley1 is now known as abentley
OllieRHey 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
OllieRthere seems to be a lack of documentation around20:37
pygiOllieR, can you run a custom daemon or is that too much to ask? :)21:18
OllieRpygi: please elaborate..21:18
pygiOllieR, do you have powers oj21:19
pygion the server to run a daemon?21:19
OllieRpowers oj, you mean root?21:19
OllieRit is my server I have full control...21:19
pygiwell, actually no :P Any home account will do :)21:19
OllieRok so what are you suggesting?21:20
pygiok, moment :)21:20
OllieRok col21:20
pygiOllieR, http://projects.serverzen.com/pm/p/cluemapper/wiki/ClueBzrServer21:20
pygiOllieR, note: bzr 1.12, it doesn't work with 1.1321:21
pygi(on server side)21:22
OllieRok interesting idea21:22
pygiIts still a bit rough, but I'm on it21:22
OllieRis this your brainchild?21:22
pyginop21:22
pygibut 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 there21:23
OllieRinterestante21:23
pygifirst things first, I don't like its security aspect21:23
pygiit needs to be more flexible =)21:23
OllieRgood luck with it looks interesting21:28
=== james_w` is now known as james_w
pygiOllieR, looking at it like this, do you have any feature requests? :)21:34
OllieRsupport for 1.13 :)21:34
pygiha!21:34
pygiindeed :p21:34
a_c_m1i 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 changes22:43
xnevermoreHey. 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
xnevermoreDoes anyone have any ideas?22:51
lifelessthat sounds fine22:51
xnevermoreany ideas for a small webserver to use?22:52
lifelessapache?22:52
xnevermorethat seems a little overkill for my purposes22:53

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!