spivpoolie: I'm reviewing http://bundlebuggy.aaronbentley.com/request/%3C48090895.1010406@arbash-meinel.com%3E00:09
pooliereplying to list mail and queries00:11
johEh, I just committed rev 88 to my bzr repository but when I run 'bzr update' from another local copy it says 'Tree is up to date at revision 87.' why?00:12
spivjoh: how did you make the copy?00:13
johspiv: pulled earlier00:13
johspiv: Ah, 'pull' did the trick :-)00:13
spivjoh: if you made it with "bzr branch", it will be an independent branch, so "bzr update" won't find the new revisions.00:13
johspiv: Right, that's what I did. So pull is the right way to update it?00:14
spiv(but "bzr pull" will)00:14
johGreat, thanks :-)00:14
spivOr if you want to behave as a checkout, you can do "bzr reconfigure --checkout".00:14
spivNot a huge difference either way.00:14
ubotuNew bug: #220067 in bzr "poor documentation/broken link on how to use split" [Medium,Confirmed] https://launchpad.net/bugs/22006702:06
=== jamesh_ is now known as jamesh
lifelesspoolie: ping04:14
poolielifeless: pong05:14
pooliei guess that was about pqm05:17
PengAugh, 561 new messages on the list.06:03
pooliespiv: what should we do re jam's fix for bug 211661?06:14
ubotuLaunchpad bug 211661 in bzr "bzr.dev smart client fails on log" [Critical,Fix committed] https://launchpad.net/bugs/21166106:14
pooliemerge it without a per-repo-impl test?06:14
spivpoolie: I think so06:35
spivpoolie: if the per-repo test lands a day later, I don't think it's a big issue (so long as it *does* happen)(06:35
pooliemaybe we should leave it unmerged in trunk and just merge it into 1.4 for today then06:41
spivThat sounds like a reasonable solution.06:41
pooliei'll do your tweak of not using an assertion06:42
poolieindeed i'd like to write a test that we have no assertions06:42
jmljetsaredim: hi06:45
jetsaredimso yea06:45
jmljetsaredim: so, you were saying that it looks like the server is maintaining the lock?06:45
jetsaredimkilled all of my outgoing shh connections for bzr06:45
jetsaredimstill says things are locked06:46
jmlwhat's the output of bzr break-lock now?06:46
jetsaredimthere's output?06:46
jmljetsaredim: it says nothing at all?06:46
jmljetsaredim: oh, wait, 'bzr break-lock <remote_url>'06:46
jetsaredimthat might help06:46
jetsaredimthe whole bzr+ssh url?06:47
jml'bzr info' should give you something to copy and paste06:47
jetsaredimhave it from the push command06:48
jetsaredimshould have something in there about needing a url06:48
clskis there a version of bzr-svn compatible with bzr 1.4rc1?06:48
jmljetsaredim: well, no arguments means break the local lock06:48
jmljetsaredim: which is roughly consistent with every other bzr command.06:49
jetsaredimi suppose the man page would have told me that06:49
jml'bzr help break-lock' also06:50
jmlwe could add an example to that for 'bzr break-lock bzr+ssh://server.example.com/foo/bar/branch'06:50
spivjml: oh, hey06:51
jmlspiv: hi :)06:51
jetsaredimok - another seemingly random question07:10
jetsaredimi added a new package a while back07:10
jetsaredimi had a personal branch called firefox-extensions/firebug.ubtuntu that got merged into ubuntu-dev and into hardy07:11
jetsaredimnow I want to update the package for a new upstream release07:11
jetsaredimi pushed to my personal firebug.ubuntu, but it doesn't show up by default in my code trees since I had previously marked the branch as merged07:11
jetsaredimam I just doing this the wrong way?07:12
jmljetsaredim: this is on Launchpad, right?07:12
jetsaredimer yea - wrong channe;07:13
jetsaredimand i think i figured out my issue anyway07:13
jmlgood good :)07:13
=== jetsaredim is now known as jetsaredim_
ubotuNew bug: #220182 in bzr "After rebase failure tree got broken" [Undecided,New] https://launchpad.net/bugs/22018211:30
hsn_are there any presentations on topic git vs bazaar11:55
=== kiko-afk is now known as kiko
=== mvo_ is now known as mvo
=== mrevell is now known as mrevell-lunch
=== jetsaredim_ is now known as jetsaredim
=== mrevell-lunch is now known as mrevell
=== mw|out is now known as mw
=== rockstar` is now known as rockstar_
=== kiko is now known as kiko-afk
mw-homeHow do I copy files in bzr?  bzr cp doesn't exist15:45
jelmermw-home: "cp a b"; bzr add b15:45
hsn_you can do symlink15:46
PengCopying isn't supported yet.15:46
=== pmezard_ is now known as pmezard
grutte_pierhsn_: symlink? you mean bzr is capable of dealing with symlinks?16:30
PengOf course.16:32
PengWell, there are some problems with the UI, but absolutely.16:32
ubotuNew bug: #220302 in bzr-webserve "Wishlist - log display with branch graph" [Undecided,New] https://launchpad.net/bugs/22030217:51
ubotuNew bug: #220295 in bzrtools "[ENH] Add plugin for gnome-keyring integration" [Undecided,Invalid] https://launchpad.net/bugs/22029517:56
=== mrevell is now known as mrevell-dinner
=== ja1 is now known as jam
ubotuNew bug: #220331 in bzr "editor paths containing spaces are not parsed correctly" [Undecided,New] https://launchpad.net/bugs/22033119:50
ubotuNew bug: #220333 in bzr "incorrect indentation level in msgeditor.py" [Undecided,New] https://launchpad.net/bugs/22033319:55
trepcai was wondering if its possible to limit access to bzr repository to only pushing20:27
trepcaso not actually changing the tree20:27
trepcajust having pending updates20:27
trepcaand when you review.. you just commit or drop them20:27
beunotrepca, by default, if you push over ssh/sftp, the working tree doesn't get updated20:28
beunobut I'm not sure how you can approve/reject changes later on20:28
beunoas in "nicely"20:28
trepcayeah, i know its default, but developer could also use push-and-update :)20:29
beunoright, than you're probably better off using something like bundlebuggy20:30
trepcauh, whats that ?20:30
beunotrepca, http://bundlebuggy.aaronbentley.com/20:30
beunoit's what we use for bzr20:30
trepcabut my project is private20:32
trepcaah, its open source, sorry :)20:32
beunotrepca, well, just make access to BB private  :)20:32
trepcawhat about these pending merges ?20:47
trepcai merged a branch from remote location20:47
trepcaand it didn't automatically update the working tree20:47
trepcastatus just says i have pending merges20:48
trepcanevermind :)20:49
trepcawhat is the best way to serve bzr ... built-in server, apache, sftp ... ?20:55
fullermdDepends on your situation, I imagine.  For me, I use bzr+ssh pretty much everywhere.20:56
trepcame too for now20:59
jampoolie: ping, are you working yet?23:01
beunoigc, hey  :)23:44
igchi beuno23:44
beunoigc, how are you?23:45
igcbeuno: I was sick in bed all day yesterday - awake today but not 100%23:46
beunoigc, aaw, I'm sorry to hear that...  :/23:46
beunowe've missed you these past weeks  :)23:48
hsn_http://bryan-murdock.blogspot.com/2007/03/cutting-edge-revision-control.html old bazaar-ng vs git benchmark, they are more or less comparable23:58
hsn_i expected git to be significantly faster23:58
lifelesspoolie: I'm better but not up to work today;23:58

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