/srv/irclogs.ubuntu.com/2009/05/14/#bzr.txt

Peng_Cool, I've never had anything destroyed by customs before. :D00:00
beunoPeng_, I'll make sure to not send any live animals in it00:01
mwhudsoncanonical t-shirts have successfully got past nz biosecurity00:01
mwhudsonwhich is probably about the strictest border control going00:03
jelmermwhudson: which one was problematic ? I don't recall having pushed anything large recently00:03
mwhudsonjelmer: not sure, perhaps i'm being over the top00:04
mwhudsonjelmer: the openoffice ones certainly did, but they're disabled now00:04
Peng_What sizes are the t-shirts? Some strange, foreign measurement system that I've never heard of?00:05
jelmermwhudson: I think the second largest one I've pushed so far would be samba, which is ~50k00:06
Peng_(Hey, I may not know anything about foreign countries, but at least I know they exist! :P )00:06
mwhudsonjelmer: hm, i'd hope that would work00:06
mwhudsonjelmer: ah, maybe not on prod actually00:06
beunoPeng_, they're measured en em's00:07
Peng_I wonder what my waist size is in ems?00:09
Peng_...I wonder what it is in inches or centimeters?00:09
beunoPeng_, of course, I was kidding00:10
beunos/m/l/xl?00:10
serviliohi! I have a working dir that I started from scratch and now I'd like make its history look like if it would have been started off from another branch00:10
beunoPeng_, http://shop.canonical.com/product_info.php?products_id=399&osCsid=deb8dc669413edbef04a27d04685add700:10
beunosee size charts00:10
servilioI've tried bzr-rebase, but only to have the other pulled and completely overwriting the new one00:10
servilioany suggestions?00:10
* servilio notes that it is his first time using rebase, so it might easily be that he's used it wrongly00:12
Peng_Cue Firefox freezing. Argh.00:12
Peng_beuno: XL, I guess. Can you steal my address from my Canonical Store account?00:19
Peng_(Actually, if you could, that'd probably be a huge privacy violation... :P )00:19
lifelessPeng_: beuno can't. A sysadmin could; you should file a question asking them to give him the address :)00:20
lifelessPeng_: or... you could just tell beuno00:20
Peng_:D00:20
Peng_Hmm, which of those is less typing? If the question was really terse...00:20
lifelessyo, give bueno moi address00:20
Peng_beuno: Normal lp:~beuno email address?00:22
Peng_You can't see the sizing chart without logging in. :\00:23
=== arjenAU2 is now known as arjenAU
beunoPeng_, got it, thanks00:33
Peng_beuno: ok :)00:34
igchi all00:52
* igc off to the dentist - bbl00:52
lifelessjam: let me know when you pass the token00:52
lifelessjam: ping01:23
jelmermwhudson: btw, is it right that the API doesn't support removing branches yet?01:49
jelmermwhudson: (I'm interested in cleaning up all those broken mirrored branches at some point)01:49
thumperjelmer: yes, the api doesn't yet support removing branches01:53
thumperjelmer: file a bug please :)01:53
thumperjelmer: tag with "api", kthxbye01:53
thumperpoolie: I can hack if you need me to try something02:23
lifelessjelmer: what are the urls for samba, both git an dbzr ?02:26
igcback02:45
lifelessjelmer: jeeeeelmer02:50
BasicOSXThis branch may be out of date, as Launchpad was not able to access it 21 minutes ago. (Not a branch: "http://bazaar-vcs.org/bzr/bzr.1.15/".) Launchpad will try again shortly.03:06
lifelessBasicOSX: I don't think it has been created03:06
lifelessBasicOSX: poolie asked in a company channel a couple of weeks back, I think noone actioned.03:07
BasicOSXok, I'll wait, just anxious to work on it03:07
lifelesspoolie: btw, when asking for a branch; if you don't get an ACK from a LOSA, the process is - file an RT03:07
pooliei know03:07
pooliei thought i did03:07
lifelessBasicOSX: we'll look at getting 1.15 on lp natively; that will need losa support, and I've started the discussion now.03:07
poolieit may be just a typo, hold on03:07
pooliehello BasicOSX03:07
BasicOSXhello poolie03:08
poolielifeless: could this just be the quirk that it doesn't push til the first commit?03:08
pooliespm^^ does the pqm 1.15 branch exist?03:08
lifelesspoolie: the instructions for making a branch for pqm include a manual push03:08
lifelesspoolie: it has been made actually03:09
lifelesspoolie: but it will be very out of date03:09
pooliei don't see it in http://bazaar-vcs.org/bzr/03:09
lifelessyah03:09
lifelessdo you want it made this far ahead of the rc?03:10
poolie2 days? sure03:10
poolieespecially considering for spm there's only 1.5 working days until the rc03:10
poolieeven less depending on travel03:10
lifelessspm: might like to update the docs, insofar as its make, setup config, and push once ;)03:10
spmupdating docs is good. doing.03:10
lifelessspm: its a manual push as there isn't a default push location03:11
lifelesse.g.03:11
lifelessbzr info ../1.1403:11
lifelesscopy, paste, change 1.14->1.15, bzr push03:11
lifeless(which I've just done)03:11
spmta03:11
lifelessBasicOSX: its all there03:12
lifelesswe'll do native lp for 1.16/2.003:12
BasicOSXShould be able to get via lp or http?03:13
lifelesslp will need to try again03:13
lifelesshttp://bazaar-vcs.org/bzr/bzr.1.15 for now03:13
spmlifeless: that push was to escu I assume. verifying.03:13
lifelessspm: look in pqm's bash history03:13
lifelessspm: it was litteraly03:13
lifelessbzr info ../1.1403:13
lifelessbzr push (copied and adjusted url)03:14
spmawesome. perfect, ta.03:14
pooliethanks spm03:14
thumperlifeless: so is my bug a dupe? and being fixed?03:20
lifelessthumper: have you donethe test ?03:21
thumperlifeless: yes, and added comments to the bug03:21
thumperlifeless: bug mail is delayed...03:21
thumperlifeless: I thought it would have gone out by now03:21
thumper:-|03:21
poolie1thumper: which?03:21
thumperpoolie1: which what? which bug? bug 37628703:23
ubottuLaunchpad bug 376287 in bzr "branch fails with "bzr: ERROR: The branch ... has no revision None."" [High,New] https://launchpad.net/bugs/37628703:23
lifelessbug 37625503:25
ubottuLaunchpad bug 376255 in bzr "smart server, new branch, ghosts, boom." [Critical,Confirmed] https://launchpad.net/bugs/37625503:25
lifelessis what I think it may be a dup of03:25
lifelessor at least very close03:25
thumperlifeless: but the smart server isn't being used between two local directories is it?03:27
lifelessthumper: same code path can be03:27
thumperok03:28
=== photon is now known as Guest52575
lifelessjam: ping03:57
jamhey lifeless, I just saw your earlier request.03:58
jamI'm sorry to say I didn't get to presentations.03:58
jamWe had the power go out last night03:58
lifelessok03:58
jamand I didn't have internet for half the day03:58
lifelessI'll carry on then03:58
lifelessjam: was just blocked until I got the token back03:58
jamPlease push them up somewhere and I'll be happy to focus on them tomorrow03:58
jamAnd if you sent me an email... I didn't get it03:58
lifelessjam: I did; its in mail to you from yesterday03:58
jamproblem with hosting your own...03:58
lifelessI'll send another one when I finish up with them today03:59
jamlifeless: yeah, no mail from 12am => 6am03:59
jamand then down again 9:30 => 1203:59
lifelessjam: it'll be queued somewhere. I sent to jam@c.c03:59
jamlifeless: right, my queue hasn't all flushed yet03:59
lifelessjam: anyhow, look for a mail from me tomorrow; as I'm grabbing the lock now :)03:59
jamYeah, the power going out was pretty flukish, but it really messed up the day04:00
jamof course, it didn't help that when the internet went out it took them 1.5 hours to realize it was an site-wide effect04:01
* igc lunch04:12
bob2does bzr use "pyftpdlib"?05:21
lifelesswe use the stdlib ftp client05:21
lifelessand medusa as a test servere05:21
bob2bugs.debian.org/52860205:23
lifeless:!grep -n pyftp bzrlib/transport/ftp/* /dev/null 2>&1| tee /tmp/v308109/005:29
lifeless 05:29
lifelessI'd query it05:29
jfroybah05:56
jfroybzr takes way05:56
jfroytoo much memory when adding large files05:56
jfroyor rather when committing large files for the first time05:56
jfroyKeeps biting me since I tend to work with large media files on a regular basis (1 GB + HD files)05:56
jfroy:(05:56
lifelessjfroy: :(05:56
jfroyit's at 2 GB real ATM05:57
jfroy>.>05:57
jfroyis there any hope of addressing that in the future?05:59
lifelessyes06:00
jfroyor it is a design necessity and someone need to slap me for versioning large binary files?06:00
lifelessbut for a trivial answer, split and join your files yourself ;)06:00
jfroyyeah well if I split those files they won't work anymore :p06:01
lifeless'and join' :)06:01
AfCjfroy: you didn't ask if there was any hope of $whatever being addressed in the _near_ future...06:02
jfroythought: could use a fancy content filter to auto-split and auto-unsplit stuff06:02
lifelesscontent filter api is probably not powerful enough06:03
lifelessbut yes, broadly; and patches to make such a thing would be good06:03
jfroy:(06:03
jfroyI wouldn't even know where to start looking :|06:03
lifelessthumper: try lp:~lifeless/bzr/repo-source07:06
thumperlifeless: do I need to build extensions?07:15
lifelessno07:15
thumperlifeless: just branch and try?07:15
lifelessbut you should07:15
thumperhow?07:15
lifelessyah07:15
lifelessmake07:15
lifelessyou need python-dev and zlib1g-dev packages installed07:15
=== herb__ is now known as herb
thumperpyrex?07:16
lifelesspython-pyrex07:16
lifelessbbs, caving in and having a pastry07:18
vilahi all07:21
thumperlifeless: branch that with 1.15dev I got AbsentContentFactory :(07:22
lifelessbranching from it ?07:22
thumperlifeless: object has no attribute get_bytes_as07:23
thumperyes07:23
thumperwell, cbranch, but yes07:23
lifelessso pushing worked but the result is broken ?07:23
thumperlifeless: I got the error getting your bzr branch from launchpad :(07:24
lifelessthumper: very interesting07:24
lifelessthumper: you have a broken bzr in production, is what that means07:24
thumperlifeless: it is 1.14.1 + patches that you got mwhudson to do07:25
lifelessyes07:25
thumperso...07:25
thumpernow what?07:25
lifelessclearly thats not quite enough07:25
thumperclearly07:25
lifelessit would be nice if my bundle was not deleted when I send to merge@...07:26
thumperlifeless: it isn't07:26
lifelessits not in the mail that gets sent out07:26
thumperlifeless: it is in the librarian07:26
lifelesswell07:26
lifelessbranch bzr.dev07:26
thumperall incoming email is stored07:26
lifelessand pull from the bundle07:26
lifelessand you'll have a working bzr to test with07:26
thumperthe email is stored, but not really accessible07:27
lifelessso07:27
thumperI'm updating my trunk07:27
lifelessI mean 'people should get the bundle I send'07:27
lifelessto be precise07:27
thumperand I'll try again to see if it matters07:27
thumperlifeless: interesting idea07:27
lifelesswith BB I would mail the list07:28
lifelessand people get my original signed email07:28
lifelessBB then send out additional data07:28
lifelessI quite liked that07:28
lifelessreally fooding now07:31
lifelesshttps://code.edge.launchpad.net/~lifeless/+junk/bbctest08:09
bob2bbc = brisbane something core?08:14
bob2hah, poor lp doesn't like that branch08:15
lifelessyes08:18
lifelesshttps://bugs.edge.launchpad.net/launchpad-code/+bug/37625508:18
ubottuUbuntu bug 376255 in bzr "CHK stream source doesn't handle ghosts." [Critical,Confirmed]08:18
lifelessmwhudson: ^08:21
lifelesspoolie: can you review my patch for bug 37625508:37
ubottuLaunchpad bug 376255 in bzr "CHK stream source doesn't handle ghosts." [Critical,Confirmed] https://launchpad.net/bugs/37625508:37
lifelesspoolie: I'll send it in tonight if you do, if looks sane to you08:37
poolielifeless: i'll try08:38
poolielifeless: are you talking in barcelona?08:38
pooliemore than usual i mean :)08:38
lifelesspoolie: 3 times08:38
poolieof course you are, you told me you're preparing them08:38
lifelesspoolie: I did:)08:41
lifelesspoolie: /wave, done for day modulo adhoc chats and submitting that branch if you ok it09:01
pooliei'll looknow09:01
pooliewas talking to vila09:01
vilabob2: BBC == BrisBane Core09:17
vilabob2: BC was already taken09:17
pooliei kind of wish you'd just spell it out09:29
pooliehaving one name was meant to avoid confusion, not invite new names09:29
=== knielsen_ is now known as knielsen
lifelesspoolie: when creating a test branch, abbreviations will be used, by nearly everyone09:32
lifelessI do use brisbane-core for tags and other things ;)09:32
poolieyeah, the branch name that provoked bob's question was not a good example09:33
lifeless:)09:35
poolielifeless: review done, effectively a 'tweak'09:44
poolieand i already filed last week the bug asking for a 'tweak' status09:44
* igc dinner09:53
pooliehi igc09:55
poolienight09:55
igchi poolie. first cut at smarter upgrades just pushed to lp btw10:03
igchope to clean-up & submit for review tonight or tomorrow10:03
igcpoolie: also, branch making commit FILE 4x faster on dev6-rr pushed for review last night10:04
poolienice one10:04
poolieones :)10:04
* igc ready heads for dinner now10:04
igcreally10:04
flo_hnshello everyone. For one of my project, instead of having one branch for the whole thing, I split it into a branch per component, figuring that would be smarter.10:04
lifelessigc: one thing that would be really useful would be a pack() after an upgrade to rr610:05
flo_hnsI have by now concluded that it's not so smart after all, and would like to unify all those branches into one ? Are there tools/ways to do that, without losing the history ?10:05
flo_hnsSo, to summarize, what I'm looking for is a way or tool, to go from many branches with no common ancestor to one branch, without losing the history. So kinda of a "repo merge" operation.10:09
flo_hnsanyone knows of such a thing ? :)10:10
bob2branch, not repo10:11
flo_hnsbob2: well, I didn't want someone to tell to go for "bzr merge" :) so i figured branch might be confusing.10:16
lifelessflo_hns: merge-into10:28
flo_hnslifeless: ah awesome, looks like what I need. thanks!10:29
=== arjenAU2 is now known as arjenAU
=== fta_ is now known as fta
jelmerlifeless: man, that pack is taking long13:36
vdsI have a problem trying to pqm-submit a branch on launchpad, after asking for the gpg passphrase bzr just hangs13:51
lifelessjelmer: you're doing it local right ?14:10
lifelessjelmer: do you have the C extensions build ?14:13
=== nekohayo_ is now known as nekohayo
jelmerlifeless: yes; no14:24
jelmerlifeless: no python-dev on target machine14:24
jelmerlifeless: done14:26
lifelessjelmer: It would be nice to get it repacked with the C extensions15:06
lifelessjelmer: I'm pulling a copy myself to test15:06
lifelessjam: fetch from a non-optimal-packed bbc branch over VFS is _painful_. Something we might want to address before 2.015:07
lifelessjam: one readv per revision painful15:07
jamlifeless: well, given that it is what, 2-40x larger?15:07
jamlifeless: so I've written code to "batch up" groups15:07
jamit is just the eternal question between15:07
jamhow much do you batch15:07
jamand when do you issue the request15:07
lifelesssure15:07
jamby *not* batching, we avoid holding the whole repo in memory15:07
jelmerlifeless: this branch is also on launchpad, but disabled I think because of size issues15:07
lifelesswe have reasonable asnwers though15:07
lifelesse.g. 64KB15:07
jamlifeless: actually, the batching was a large win for stuff like 'bzr ls' because it had to hit a lot of tiny groups15:07
lifelessjelmer: yes, it was 1.5GB :P15:07
lifelessjam: I must sleep, was just finishing off a little personal hacking when you happened by ;)15:07
lifeless23:40 here15:07
jamsure15:07
jamsleep well15:07
jelmerg'night lifeless15:07
jamlifeless: argh.... 'bzr push lp:...' AttributeError: 'AbsentContentFactory' object has no attribute 'get_bytes_as'15:07
lifelessI sent you a couple of mails too, largely content free :P15:07
jelmerwhen should I be using str.decode("utf-8") and when osutils.decode_utf8() ?15:07
jampushing up a non-stacked branch, as the project doesn't have any development focus yet15:07
lifelessjam: it has ghosts15:07
lifelessjam: updated your bzr15:07
* lifeless is gone15:07
jamwell, this is 435915:07
jelmerjam: ^15:08
lifelessway to old you need 4362 or so15:08
jamjelmer: my copy of osutils doesn't have decode_utf815:08
jelmerjam: sorry, I mean cache_utf8.decode15:08
jamjelmer: I would generally use .decode('utf-8'). cache_utf8.decode will shove the unicode and str objects into dicts15:08
jamso as to 'de-dupe' them later15:08
lifelessjam: https://code.edge.launchpad.net/~lifeless/bzr/repo-source.15:08
* lifeless is gone15:08
LarstiQhah, the maintenance of http://bazaar-vcs.org/ is returning html when bzr looks for the bzrdir format on http://bazaar-vcs.org/bzr/bzr.dev15:24
=== thunderstruck is now known as gnomefreak
jamLarstiQ: yep, just ran into that myself16:14
jamIt seems bzr is about 3 revs old in Launchpad16:15
jamFortunately, I get to cheat16:15
jamand I can connect directly to the host via bzr+ssh :)16:15
LarstiQtsk :)16:15
jamthat said, even with Robert's fix, 'bzr push' fails for this branch unless I do 'nosmart+'16:17
LarstiQis the most recent bzr.dev available via a smart protocol?16:24
LarstiQfor the general public16:24
bialixjam: hi16:27
jamhey bialix16:28
jamLarstiQ: no, I just have SSH access to that machine16:28
bialixdoes merging through pqm still the same as year ago?16:28
jambialix: yep16:28
jamI can submit if you prefer16:30
jamI know there is also some maintenance going on, though I don't think it effects pqm right now16:30
bialixjam: please do16:30
bialixjam: I think your latest note should be tweak16:30
bialixif you'll send merge request, can you tweak, please?16:30
jamsure16:30
bialixjone more question16:30
bialixs/jone/one/16:30
Takbialix meant: one more question16:30
jamwell, it depended on whether we actually wanted to do the change or not, I left it open for you to decide16:30
bialixjam: it was premature optimisation16:30
LarstiQTak: are you a bot?16:30
LarstiQs/you/running/16:31
TakLarstiQ meant: Tak: are running a bot?16:31
bialixnice16:31
bialixTak: teach me English please16:31
LarstiQs/s/&/16:31
LarstiQhmm, I hope that didn't cause an infinite loop16:32
bialixjam: my patch for unicode cmdline: it will be in next bzr 1.16?16:32
jambialix: well, 1.15, yes16:33
bialixah, even so16:33
bialixthat's nice to have in rc1. more people will test it16:33
bialixtoday we have a question in ru-bzr about diff headers and non-ascii filenames16:35
bialixthe problem is: diff headers encode filenames as utf-816:35
bialixthis is very bad for windows console16:36
bialixI remember we discussed it in the past16:36
bialixthere is no right choice here16:36
bialixI'm thinking about adding special command-line option, e.g. --header-encoding, to force diff header show filenames in other encoding (oher than utf-8)16:37
bialixjam: ^16:37
jambialix: so the code to fix that sort of thing is rather involved16:37
jamIt required changing 3-4 layers to pass around a 'path_encoding' parameter16:37
bialixwdym?16:37
bialixoops16:37
bialixdoes it will affect merge directives?16:37
jamThe place where we would know the output encoding16:37
bialixis it will be major API break?16:38
Takargh16:38
jamthen has to pass that down through about 4 layers to actually get that value set to the code that writes to the screen16:38
jamTak: ??16:38
Taksorry, I didn't mean for the regex script to be running in this channel16:38
jamLarstiQ: what is s/s/&?16:38
jamor is it just that you were regexing a regex?16:39
bialix:-D16:41
jambialix: It isn't a "major" break, but a minor one, and tracking down all the cases was ugly enough I didn't continue to persue it a while ago16:41
LarstiQjam: s/prefix/& append/16:41
LarstiQjam: and indeed, the s was an attempt to regex the regex :)16:41
bialixjam: and this change also affects log -p IIUC16:41
bialixI'm not sure about merge directoves16:42
bialixdirectives16:42
jambialix: if we had support to pass a value for path encoding16:42
jamwe can just make sure that merge directives pass utf-8 there16:42
bialixone thing that bothers me is behavior of GNU diff (from gnuwin32.sf.net). It emits filenames in user_encoding16:42
jambialix: I'm pretty sure GNU diff emits everything in OEM encoding16:43
jamso Unicode names aren't guaranteed to work16:45
bialixjam: no16:45
jamwhat do you get for: "diff Тест جوجو" ?16:45
jamMy very strong guess is that 'GNU diff' thinks of filenames as pure 8-bit octets16:45
jamand if OEM encoding can't handle a given Unicode filename16:45
jamit just fails16:45
jamsince it can't *read* the file16:45
jam(on my platform, both of those would show up as ???? ????, and I don't have a filename named ????)16:45
jamI could certainly be wrong16:45
bialixjam: I've got nothing16:46
bialixI'll try to create Arabic filename first16:46
jambialix: Explorer should handle it fine16:48
bialixC:\Temp\2>diff -u Тест جوجو.txt16:50
bialixdiff: ????.txt: Invalid argument16:50
jambialix: yep16:50
bialixGNU diff does not handle pure unicode16:50
jambialix: right, so if you don't deal with unicode ,then you just write the 8-bit string that you read, back onto the wire16:50
jamwhich is generally OEM encoding16:50
jamIIRC16:50
jamit doesn't specifically matter what it is16:50
bialixbut16:50
bialixC:\Temp\2>diff -u Тест Тест216:50
bialix--- Тест        2009-05-14 18:44:25.953125000 +030016:50
bialix+++ Тест2       2009-05-14 18:44:38.734375000 +030016:50
bialix@@ -1 +1 @@16:50
bialix-foo16:50
bialix+bar16:50
bialixfilenames in cp125116:50
jambialix: Is this on Russian windows?16:50
bialixno16:50
bialixit's on English netbook16:50
TakLarstiQ: it disallows that :-P16:50
bialixbut with Russian settings16:51
jambialix: http://www.eggheadcafe.com/conversation.aspx?messageid=33050149&threadid=3305014416:52
jam If an application is compiled for ANSI API, then the filenames will be recoded to/from current codepage.16:55
jamWhich means, try doing "chcp 437"16:55
jamand see if 'diff' continues to work16:55
bialixyes, it works16:55
bialixC:\Temp\2>diff -u Тест Тест216:55
bialix--- ╥σ±≥        2009-05-14 18:44:25.953125000 +030016:55
bialix+++ ╥σ±≥2       2009-05-14 18:44:38.734375000 +030016:55
bialix@@ -1 +1 @@16:55
bialix-foo16:55
bialix+bar16:55
bialixbut filenames still in cp1251 as you could see16:55
jambialix: well, I see them as horribly horribly broken16:55
jamat least in your paste16:55
bialixthem? GNU diff?16:55
jambialix: in the paste you just generated, I get very bad characters shown16:55
jam--- [] [sigma] [+/-] [>=]16:56
bialixC:\Temp\2>chcp 86616:56
jambialix: and when I do "diff Тест.txt Тест.txt"16:56
bialixActive code page: 86616:56
jamI get:16:56
bialixC:\Temp\2>diff -u Тест Тест216:56
bialix--- ╥хёЄ        2009-05-14 18:44:25.953125000 +030016:56
bialix+++ ╥хёЄ2       2009-05-14 18:44:38.734375000 +030016:56
bialix@@ -1 +1 @@16:56
bialix-foo16:56
jamdiff: ????.txt: No such file or directory16:56
jamdiff: ????.txt: No such file or directory16:56
bialix+bar16:56
bialixI've created my files first16:57
bialixC:\Temp\2>diff --version16:57
bialixdiff (GNU diffutils) 2.8.716:57
bialixWritten by Paul Eggert, Mike Haertel, David Hayes,16:57
bialixRichard Stallman, and Len Tower.16:57
bialixCopyright (C) 2004 Free Software Foundation, Inc.16:57
bialixThis is free software; see the source for copying conditions.  There is NO16:57
bialixwarranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE16:57
jambialix: i created them as well16:58
bialixjam: as I could see diff emits simply characters in cp1251 encoding16:58
jambialix: not according to your paste16:58
bialixregardless of real console encoding16:58
jamit emits them as 8-bit filenames16:58
jamwhich then get interpreted by the consoles' code page16:58
jamnow, I'm not sure how these are stored *on disk* exactl16:59
jambut the fact that Arabic didn't work hints that more might be going on16:59
jambialix: anyway, what *I* would do in bzr, is to take the Unicode name, and try to encode it into the sys.stdout.encoding (with replace=True). And if sys.stdout is a file, then do something like always utf-817:00
bialixbear in mind recent patch for unicode cmdline it seems GNU diff using filenames "as is" without encoding them to unicode17:00
jamI think technically it is supposed to be locale.getpreferredencoding at that point17:00
bialixbbiab17:01
jamjelmer: I'm not sure what you are doing, but I see: Thu May 14 16:38:46 2009 UTC: Jelmer Vernooij <jelmer@samba.org>, Request for non-PQM managed branch.17:08
jamon http://pqm.bazaar-vcs.org/17:08
jamI'm guessing you have your submit branch set up incorrectly17:09
jelmerjam: oh17:09
jelmerjam: pqm-submit was spitting out HTML so I send in a merge request manually17:09
jelmerjam: still is, btw - is anything up with it?17:10
jamjelmer: bazaar-vcs.org is undergoing maintenance17:10
jamand yielding HTML when you try to read .bzr/branch/format17:10
jam(It yields the main page, IIRC)17:11
jamThough I thought 'pqm-submit' only checked that your public branch was valid17:11
jamso I don't have any idea why it would be checking bazaar-vcs.org17:11
jelmerjam: it asks the submit branch for its public location apparently17:17
jamjelmer: right, so that you can have a local mirror, and not have to hit the remote location17:18
jamto determine what revisions to send17:18
jamwell, that is why we have it for 'bzr send', and the 'merge target' gets reused for pqm-submit17:19
Kissakiusing bzr on windows. On "bzr ignore <file>" a versioned file, it will warn me that it's versioned. On "bzr status" it will still list it as modified (as before) and worse, the ignored .bzrignore file is displayed as well. "bzr revert .bzrignore" will even tell me "removed" but the file itself is still on the hdd.17:24
Kissakimaybe I should submit a bug ticket17:24
Kissaki...17:24
jamKissaki: after 'bzr revert .bzrignore' Isn't the file renamed to .bzrignore.~1~ ?17:29
jamThe property of being "versioned" supersedes the property of being ignored17:29
Kissakino17:29
jamso if you want to remove and ignore you need to do that17:29
Kissakiso there's no way to ignore a versioned file?17:30
Kissakibut still, it's broken17:30
jamKissaki: "bzr ignore X; bzr rm X17:30
jamKissaki: I just checked, we never delete newly added files via revert17:30
Kissakiit won't fetch it then again?17:30
jamso if you do:17:30
jambzr add somefile17:30
jambzr revert17:30
Kissakiah ok17:30
jamIt will leave 'somefile' alone17:30
jamyou may want "bzr rm --keep X"17:30
jamdepending on whether you want the file actually deleted from disk, or not17:31
Kissakithx17:34
=== davidstrauss_ is now known as davidstrauss
Kissakiwtf, now after adding another, unversioned file it's displayed as added again, the .bzrignore17:53
KXDoes anyone use bzr with redmine?17:57
jamKissaki: we generally version .bzrignore, so that your ignore list gets transmitted18:02
jamI belivee 'bzr ignore X' automatically creates it and versions it.18:02
Kissakibut it did seem to work before... Maybe I did delete it from repo, but it was kept on hdd...18:05
Kissakiso I thought it would work without commiting it18:05
Kissakibut if I specifically ignore .bzrignore, shouldn't it be ignored then?18:06
Kissakiafter all, if I want it versioned, I won't ignore it18:06
YoussefHello guys!18:33
Youssefi just have a question18:34
YoussefI would like to know what's the difference between "Create a checkout" and "Make a local copy of the branch" please18:35
Youssefin the tortoisebzr gui18:35
KXwell19:01
KXsince the site is down and I can't access the docs, would someone mind helping me set up my ssh key on windows?19:02
KXI used puttygen.exe on my pc, saved id_rsa and id_rsa.pub in Docs & Settings/Me/.ssh and then on the server in ~/.ssh I made authorized_keys with my public key all on one line and the "run bzr in cmd shell" still asks me for an SSH password when I do e.g. bzr update19:03
jamKissaki: you could try doing echo "./.bzrignore" > .bzrignore19:05
jambut doing "bzr ignore .bzrignore" wouldn't do what you want, as it would then add the file19:05
jamKX: I would usually use pageant, if you have putty19:05
jamStart/Programs/Putty/Pageant19:05
KXI have it, just not sure hwat to do19:05
jamadds an icon to your systray19:06
jamthen right click on the icon, Add Key19:06
KXI've efound out that apparently putty uses a different format to openssh19:06
jamKX: just for the key file format19:06
KXso I'm going to try doing export as openssh key real quick19:06
jambut the Public/Private key stuff is the same19:06
jamIf you use Pageant, then you *want* putty's format19:06
KXmmm, well is it not possible without pageant?19:06
jamIt *is* possible, but I still think pageant is *easier*19:06
KXI guess I'll do it that way if it works19:06
KXOk I've opened it19:07
jamSo there should be an icon of a computer with a hat in your systray19:07
KXso I save the private key as id_rsa.ppk in .ssh and then click on the icon anadd key and locate that file19:07
jamyep19:07
KXok19:07
jamIf pageant is running, and your key has been added, then we can access it without promptingyou19:08
jamthough you still need to get the public key line from puttygen so that you can upload your key to the remote machine19:08
KXoh, so that's it? I'll try it now then19:08
KXI've already done that19:08
KXauthentication publickey failed19:09
KXit should be called id_rsa.pub in .ssh right?19:09
jamKX: so the key format from puttygen doesn't match 'id_rsa.pub' format.19:10
jamhowever, if you added the key to pageant, we don't care what files are around19:10
jamwe talk to pageant *first* (and then look for files)19:11
KXwell the format looks like19:11
jamso if you are getting failed19:11
jamthat means there is a problem elsewhere19:11
KX---- BEGIN SSH2 PUBLIC KEY ----19:11
jamcan you paste the connection output?19:11
KXand an END block, with data in between19:11
KXWell all it says after I run bzr update is19:11
jamIt is possible you are running openssh which doesn't know how to connect to pageant, versus using paramiko internally19:11
jamtry:19:11
jamset BZR_SSH=paramiko19:11
jambzr update19:11
KXConnection (version 2.0, OpenSSH_4.3)19:11
KXAuthentication (publickey) failed.19:12
KXSSH password:19:12
jamwell, if it is printing out "Connection (version...)" then it is using paramiko19:12
KXbut it says openssh there :s19:12
jamso I'm guessing you don't have the public key uploaded to the other side correctly.19:12
jamKX: That is the *remote*19:12
vxnickcan anyone tell me how I can ignore all subdirectories except a certain one? I've tried expanding on the one provided by 'bzr help ignore', but I get "event not found" when trying "RE:(?!modules/babble/).*"19:12
jamopenssh locally doesn't print a Connection line :)19:12
jamvxnick: "bzr ignore *; bzr add subdir"19:13
jamthe add will supersede the ignore19:13
KXon the remote, it is in ~/.ssh/authorized_keys and it looks like ssh-rsa SPACE lots of junk ending with == SPACE rsa-key-.....19:13
jamor you could do19:13
jambzr ignore ./*19:13
vxnickjam: thanks :)19:13
jamto just ignore top-level dirs automatically19:13
KXanything wrong with that?19:13
jamKX: well, that *sounds* correct. Of course, you have to check things like19:13
jamperms on ~/.ssh19:13
jamand ~/.ssh/authorized_keys19:13
KXwhat should they be?19:13
jamIIRC if they arent 700 and 600 then openssh refuses to connect19:14
jamlet me check here19:14
KXthanks19:14
jamKX: chmod 0700 .ssh; chmod 0644 .ssh/authorized_keys19:14
jamis what I have19:14
jamIf you have 'root' access on the remote machine, I think it gives warnings about this in /var/log/secure19:15
KXI can access /var/log but not secure19:15
KXI'll try now I changed the file modes19:15
jamyou might check /var/log/messages, but yeah, usually only root can read the logs19:16
jamjust in case19:16
KXthank you very much19:16
vxnickjam: ignore * then bzr add sub/dir didn't exactly work, as it re-added the parent 'modules' directory in order to add modules/babble19:16
KXjam it works lovely now, thanks I've been trying to do this for 2 days ... who'd have thought it was file permissions ...19:16
jamvxnick: that is required19:19
jamif you did "bzr init ."19:19
jamyou can't just add "foo/bar" without adding "foo/"19:19
jamif you prefer, you could19:19
jamcd foo19:19
jambzr init19:19
jamor cd foo/bar; bzr init19:19
vxnickwell this is a checkout you see19:19
KXvxnick, what are you trying to do with our dirs? :P19:19
vxnickit's not a problem, just wanted to let you know19:20
=== nevans1 is now known as nevans
=== nevans1 is now known as nevans
davidstraussWhat's up with the bzr site?19:39
LarstiQdavidstrauss: hrmph, this is silly now19:53
davidstraussLarstiQ: ?19:53
LarstiQjam: can you/should I raise the topic of bazaar-vcs.org19:53
LarstiQdavidstrauss: this is no longer 'shortly'19:54
davidstraussLarstiQ: please explain19:54
* LarstiQ counters with a question19:55
LarstiQdavidstrauss: when you said "what's up with the bzr site", what did you have in mind?19:55
LarstiQmaybe we're talking about different things19:55
davidstraussLarstiQ: When will the wiki be back online19:55
LarstiQdavidstrauss: right. I don't know. I'm surprised it isn't back already.19:56
* beuno asks19:57
LarstiQbeuno: if it really still needs to be down, could they at least make `bzr pull http://bazaar-vcs.org/bzr/bzr.dev` not bork on bzrdir format query getting html back?19:58
beunoLarstiQ, asking  :)19:59
LarstiQbeuno: kiitos :)19:59
jamLarstiQ: I already asked in canonical #is, it seems that moin upgrade was having real problems20:07
jambeuno: argy was the one working on it20:07
jamwell, that was ~3 hours ago20:08
LarstiQoops20:08
LarstiQis this my fault? :)20:08
jamLarstiQ: no20:08
* LarstiQ asked for a moin upgrade20:08
jamLarstiQ: AFAIK they upgraded the machine to Hardy, which "comes with" an upgrade to moin20:09
jamApparently moin upgrades aren't very perfect ...20:09
LarstiQjam: ah ok20:09
jambeuno: sorry, 'agy' not 'argy'20:09
beunojam, yeah, guessed it  :)20:09
beunonobody's answering though20:10
jamwell, given London time, it is ~ 8pm there20:10
jamit is possible he stopped, though it would be nice to have *something* before he leaves20:11
jamI guess we have the Maintenance warning, rather than utter failure20:11
jam(in the morning it was ConnectionError)20:11
LarstiQah20:12
luke-jr__jelmer: btw, the svn+http syntax is basically required for password-locked repositories it seems20:14
jelmerluke-jr__: That's caused by bzr sending a POST request to see if there's a bzr smart server running20:16
jelmerluke-jr__: that triggers a "auth required" error on a lot of servers20:16
luke-jr__no doubt20:17
luke-jr__the "svn+ is obsolete" message just gets annoying while it's still required20:17
jelmerluke-jr__: that's no longer printed in newer bzr-svn's20:18
luke-jr__i c20:18
fbondbzr missing shows I have an extra revision and so does my parent, but `bzr rebase` does nothing.  Any good reason for this?20:21
fbondbzr rebase says "Rebasing on file:///...", but then nothing happens.20:22
LarstiQfbond: rebasing on a different branch than missing checked?20:22
LarstiQare you sure you want to rebase btw?20:22
fbondLarstiQ: Yes, I'm sure, and yes, both are going to the parent implicitly.20:23
fbondOr at least, both are claiming to go to the same branch (the parent).20:23
LarstiQfbond: if they print out the same branch url, then yes.20:23
LarstiQfbond: oh, wait.20:24
LarstiQfbond: if you have one extra, and no missing, there is nothing to do for rebase.20:24
LarstiQfbond: by definition the rebase result is the same as prior to the rebase.20:24
fbondLarstiQ: I have one extra, and the parent has one extra, too.20:25
fbondbzr missing lists a total of two revisions, one on my side, one on the parent's side.20:25
LarstiQfbond: ok.20:25
LarstiQin that case, no idea.20:25
LarstiQfbond: anything in ~/.bzr.log?20:25
fbondOnly what I would expect; no trace backs or anything.20:26
jelmerfbond: rebase rebases on the push location by default, not on the parent location20:26
LarstiQjelmer: fbond mentioned the branch urls are both the parent20:26
fbondjelmer: bzr help rebase says it uses the parent...20:27
jamfbond: I'm pretty sure you want 'replay' but I'm not positive20:28
jelmerfbond: Sorry, never mind me. It is the parent actually.20:28
fbondjelmer: No problem.20:29
fbondAnyway, rebase has certainly worked for me in the past.20:29
LarstiQfbond: I would indeed expect something to happen.20:29
LarstiQfbond: does -r help?20:29
jamLarstiQ: bazaar-vcs.org seems to be working...20:29
fbondYeah, I think it's a bug...20:29
fbondLarstiQ: I'll try using -r.20:29
LarstiQjam: yay!20:29
LarstiQjam: thanks to whomever fixed it.20:30
LarstiQdavidstrauss: ^^20:30
fbondLarstiQ: Ouch, weird.20:30
davidstraussLarstiQ: cool20:30
beunoLarstiQ, server should be up again20:30
LarstiQbeuno: pull worked, thanks20:30
fbondLarstiQ: bzr rebase -r XXX caused *my* XXX to be replaced by *parent's* XXX.20:30
jelmerfbond: any merge revisions involved?20:31
fbond(and my XXX has disappeared)20:31
fbondNo big deal, this was a merge from another branch, anyway.20:31
fbondBut that was not expected.20:31
jelmerfbond: rebase ignores merges, there's an open bug about that20:31
fbondjelmer: Ignores merges?20:31
fbondThere was content from this merge, FWIW.20:32
fbondjelmer: Do you have a bug #?20:32
jelmerfbond: it's the highest listed one in the bzr-rebase bugs page iirc20:33
fbondjelmer: Looks about right.20:35
jamfbond: cd trunk; bzr merge ../my branch; bzr revert --forget-merges20:35
jamshould be ~equivalent to 'bzr rebase'20:35
jamNote that you'll lose the merge parent of 'my branch'20:36
jamyou could get it back if you want to be extra creative20:36
fbondjam: Thanks; it's easy enough to recreate the merge revision.20:37
fbondI was just surprised to see rebase fail.20:37
=== tchan1 is now known as tchan
jamLarstiQ: well, it looks like the new Moin engine changed {{{ verbatim }}} display a bit20:57
jamIf you have a multi-line verbatim20:57
jamyou have to start it with an empty line20:57
jamor it doesn't think it is verbatim20:57
jamsee the change to http://bazaar-vcs.org/Roadmap/BrisbaneCore/Details20:57
jamjust in case we run into that elsewhere, I want someone else to know about it :)20:58
* LarstiQ looks at Download20:58
LarstiQjam: ah, I see20:59
LarstiQit seems the wiki comments do work now21:00
jamcomments?21:01
jam ### lines ?21:02
LarstiQ{{{#! wiki comment21:03
LarstiQor /* */21:03
jamah, k21:04
jelmerjam: I'm now getting 1.35s to extract all bzr.dev revs using the XML serializer21:05
jelmerjam: and 0.91 with the RIO one21:05
LarstiQjam: which I had attempted for the list of older releases on /Download21:06
jamLarstiQ: so {{{#! => <!- ?21:06
jamor whatever the HTML comments were21:06
LarstiQjam: no, a <div> which is not visible by default, but you can toggle comments to be visible21:07
jamah, interesting21:07
jamI guess that makes it logical for the download stuff21:07
jamsince a screen-scraper will always see the div21:07
jamand probably won't apply the CSS21:07
LarstiQjam: exactly, I gleaned the idea from the TurboGears (pypi listed) download location, which easy_install knew how to handle21:10
dirkDis it possible to let bzr not ignore *.so files?22:02
dirkD(without using bzr add .......................so al the time)22:03
jelmerdirkD: remove the *.so pattern from the .bzrignore file22:03
dirkDjelmer: it's not there22:05
dirkDit seems like bzr ignores *.so by default22:05
jelmerdirkD: perhaps ~/.bazaar/ignore ?22:07
dirkDyes, there it is22:07
dirkDis it possible to make an exception for that (in the tree)?22:08
dirkDotherwise every developer has to change his ~/.baazaar/ignore file22:08
jelmerI think I've seen something like that, I'm not sure how exceptions work though22:09
beunolifeless, VFS calls have gone away on a few operations when interacting with Launchpad. Did LP get upgraeded os is the client getting smarter?22:09
vxnickhi guys - is there a way that I can bzr ignore ONLY the root index.php file, and not the same in sub-dirs?22:24
dirkDvxnick: bzr ignore ./index.php i think22:25
dirkD(i'm not sure)22:25
vxnickthanks dirkD I'll give it a go22:25
vxnickthat looks like it worked, thanks :)22:28
dirkDnp vxnick22:31
lifelessbeuno: neither22:37
lifelessbeuno: you're not using enough bits in your mask for determining'same operation'22:38
beunolifeless, uhm...  what?22:38
lifelessbeuno: push with the same format is vfs free except on new branches22:39
lifelesssame for pull22:39
lifelessdiffering formats will trigger vfs22:40
lifelessnew branches will trigger vfs22:40
lifelessmoin22:41
lifelessbtw22:41
beunomornin  :)22:41
jelmerah, moin is working again \o/22:41
jamdirkD: If you 'bzr add foo.so' it will always be versioned22:42
jamThere isn't a way to specify you want to 'undo' an ignore otherwise22:43
dirkDyes, but then i have to ass 130 .so files manually22:43
jamso people creating new .so files won't see them22:43
dirkDs/ass/add22:43
jamdirkD: find . -name *.so -print0 | xargs bzr add22:43
jamdirkD: find . -name *.so -print0 | xargs -0 bzr add22:43
jamtakes... 2s ?22:43
lifelessbzr ls --ignored | xargs bzr add22:44
dirkDthat's an option, but it has to be used by some people who will forget this22:44
beunolifeless, btw, bling: https://code.edge.launchpad.net/bzr22:45
beuno(I know you like bling)22:45
dirkDjam: giving them a new ~/.bazaa/ignore is more easy then22:45
lifelessbeuno: the graph?22:45
lifelessbeuno: is the word 'ago' meant to be below the ..... line ?22:46
beunolifeless, it's suppose to be on the same line22:46
lifelessbeuno: its on the same row as lp:bzr/1.1522:47
beunolifeless, ah. shouldn't be. Got a screenshot handy?22:47
lifelessbeuno: unmaximaise your browser22:48
lifeless:)22:48
lifelessmines about 800px wide22:48
beunolifeless, borwser size doesn't break it22:48
beunofont size does, though22:48
beunobut I have to increase it 4 times22:48
jamhey lifeless22:48
lifelessalso, perhaps it would read better as "124 commits in 90 days. Last 3 hours ago."22:48
lifelesscause I don't know what 'max' means22:49
beunoright22:49
beunothat's the problem22:49
lifelessbeuno: I'm using epiphany22:49
beuno124 is the max number of commits per day22:49
jamlifeless: do you have a min-font size set?22:49
beunoin 90 days22:49
beunonot super-clear22:49
lifelessjam: no22:50
lifelessI have my DPI set accurately22:50
lifelessand 10 point document font in font-appearances22:50
lifelessbeuno: peak daily22:50
* beuno tries epiphany22:50
lifelessbeuno: 90 day activity, 124/day peak, last 3 hours ago22:50
lifeless90 day view, peaked at 124/day, idle for 3 hours22:51
lifelesshi jam22:51
beunolifeless, thanks for the feedback, will look into it22:52
beunolifeless, right, in epiphany it does wrap22:53
beunoI'll look into that as well22:53
lifelessbeuno: its cute; its likely also broken :)22:54
lifelessbeuno: I bet that 124 is 'a big merge'22:54
beunolifeless, yes, i22:54
beunoit's not mainline commits22:54
beunoI decided that explicitely22:54
lifelessI think it will be confusing if that graph doesn't line up with bzr log22:55
beunowhy wouldn't it?22:55
beunobecause of it not showing merges now?22:55
lifelessbzr log by default now only shows mainline commits22:55
lifelessI'm not advocating either position btw22:55
lifelessI'm just advocating keeping the theme the same across the platform22:56
lifelesslp's branch view only shows mainline commits22:56
beunoyeah, it's a tough choice22:57
beunobecause merges, in many ways, show more work22:57
lifelessI don't think its that tough ;) confuse users? [Yes] [no]22:57
lifelessoh yes; FWIW I argued for keeping log showing all commits not just mainline22:57
lifelesswhich would be consistent with the bling22:58
beunoif only performance hadn't been so bad, I would of agreed  :)22:58
lifelessbeuno: we have to revisit revnos; either to get better code to assign or to change it to one we can write fast code for22:59
jamlifeless: for the groupcompress talk, should I start with the graphs (to give "wow" factor) or should it come after discussion of the design?22:59
jamIt feels like I'm starting "wow" and then just sort of talking without ending with a bang23:00
jamlifeless: we also need to consider the merge-sorted indenting23:00
jam*just* revnos isn't enough23:00
jamyou can approximately do what we have with set-difference operations, and a smart difference that doesn't walk the whole ancestry23:01
lifelessjam: yes; well revnos were enough in the first round of dotted revnos, I think. anyway, its moot- until someone has it as top of pile23:01
lifelessbut I do feel we should decide sooner rather than later the plan so users don't get flummoxed again, later.23:02
lifelessjam: the gc talk, IIRC was a big gc and a bit chk23:02
lifelessso we could do two separate sets of graphs23:03
jamlifeless: so far the GC talk has no chk23:03
lifelessor we could use some summary numbers, and then graphs at the end23:03
jamnew compression backend 'group-compress'. John and I present the internals of this exciting compressor, its genesis, design and performance details.23:03
lifelessoh right23:03
lifelessno chk for us23:03
lifelesswe can obviously cheat23:04
lifelessanyhow23:04
jamwell, I can move the "text extraction" performance slides to the end23:04
lifelessI think waking the audienc eup is good23:04
jamand leave the "compressed size" to the front23:04
lifelesswe could even spread them around23:05
lifelessbzr vs git at the front23:05
lifelesswow we sucked23:05
lifeless<details>23:05
lifelessbzr v git now23:05
lifeless[I know that more than gc is in there, but we could compare just compressors]23:06
lifelessor perhaps hg would be more entertaining23:06
lifelessbtw we're still slightly larger than git for samba23:06
lifelessnot sure why23:06
jamlifeless: we are larger than git for launchpad, too23:06
jam95 => 105 or so23:06
jamw/ lzma we are ~=23:07
lifelessthat overall or .pacj23:07
jamlifeless: du -ksh .bzr .git23:07
jamso including indices23:07
lifelessI haven't got an overall for samba yet23:07
lifelesshmm, still need to make finding revisions faster23:08
lifelesswe need 'empty' to come back from the smart server23:08
jamlifeless: so for 'time get_record_stream(all_texts)' I get a peak of about 330MiB/s if I do 1 pass, and 570MiB/s if I put it under timeit23:08
jamthoughts?23:08
luke-jr__git has about 3 minor things better than bzr23:08
lifelessjam: you mean for record in stream:record.get_bytes_as() ?23:09
luke-jr__IMO23:09
jamah, gc.disable => 461MB/s23:09
jamlifeless: right23:09
jelmerluke-jr__: well, what are they ? :-)23:09
luke-jr__jelmer: it tracks copies, to some small degree23:09
jamI'm just trying to present things 'faithfully' though I know that 'peak' is almost 2x more than 'standard'23:09
lifelessjelmer: I recompressed samba, a 169MB pack23:09
jamlifeless: down from 1.5GiB?23:10
lifelessjam: yes23:10
lifelessjam: actually, 1.7 or so23:10
luke-jr__jelmer: I kinda like the "git add everything to commit" thing23:10
luke-jr__and cherry picking23:10
jelmerluke-jr__: Git doesn't track copies any more than bzr does, but the UI can infer where a copy was done23:10
luke-jr__jelmer: the UI is part of git23:10
jamlifeless: could be the de-duping23:10
jam(for lp in git)23:10
jelmerluke-jr__: yeah, but tracking implies it's stored somewhere23:10
lifelessjam: of same sha files?23:11
jamIIRC, we have about 50% dupe texts, 70% of which are the empty text23:11
jamlifeless: right23:11
luke-jr__jelmer: what git does is slightly better than bzr23:11
lifelessjam: would be good to make the file graph really separate23:11
jamlifeless: yep23:11
jelmerluke-jr__: I'm not disagreeing there :-)23:11
luke-jr__jelmer: I still think bzr needs to add copy support ;)23:11
jelmerluke-jr__: What do you mean with "git add everything to commit" exactly ?23:11
lifelessjelmer: the index23:11
luke-jr__jelmer: git doesn't commit changes unless you add them explicitly23:11
jelmerluke-jr__: It's planned, but not one of the highest priority features23:11
jelmerluke-jr__: ah, ok23:11
luke-jr__just because fileA changes doesn't mean you want to commit t23:11
luke-jr__it*23:12
jelmerluke-jr__: What's better about git's cherrypicking?23:12
luke-jr__jelmer: it works?23:12
lifelessjelmer: it has a one-shot command23:12
luke-jr__bzr's cherrypicking is just a diff patch23:12
jelmerluke-jr__: gits is a diff patch too23:12
lifelessluke-jr__: so is gits23:12
luke-jr__really? :/23:12
lifelessreally23:12
luke-jr__it doesn't update the tree?;23:12
lifelessthey record the revid it came from23:13
lifelessthats all23:13
jelmerluke-jr__: it adds to the commit message a note saying what was cherrypicked23:13
luke-jr__and copy that revid and its dependencies into the repo?23:13
lifelessno23:13
luke-jr__:/23:13
luke-jr__ok, 2 things then :p23:13
luke-jr__oh23:13
luke-jr__git does appear to be OK with cross-merges23:13
luke-jr__merge A into B, then B into A, etc23:13
jamlifeless: token is yours, push just finished23:14
lifelessthanks23:14
jelmerluke-jr__: bzr handles that too, although you have to specify --lca to merge to get it to deal with them properly23:14
lifelesswhere are we up to23:15
jelmerlifeless: it'll actually tell you if it sees a cross merge23:15
jelmers/lifeless/luke-jr__/23:15
luke-jr__jelmer: does --lca actually work reliably?23:16
luke-jr__--weave sure doesn't23:16
bob2is --lca going to become the default sometime?23:16
jelmerluke-jr__: I've never had trouble with --lca23:16
jelmerI think we scared Aaron by talking about merge algorithms23:16
luke-jr__jelmer: inferred renames would be a nice thing too23:18
jelmerluke-jr__: see "bzr rename --auto"23:18
jelmeror at least I think that was what the name was23:18
luke-jr__ah23:18
luke-jr__ok, so really just 2 :)23:18
luke-jr__1. explicit adding to commits (very minor, especially since I can uncommit after making a mistake)23:19
luke-jr__2. copying23:19
luke-jr__IMO, there needs to be 3 new kind of copying23:19
luke-jr__1. template (changes in original need to be merged into the copy; not sure how this would apply correctly outside of merges)23:20
luke-jr__2. history-only (new file, but retaining history of original file at time of copy)23:21
luke-jr__3. unknown copy (always causes conflicts in ambiguous cases)23:21
jelmerluke-jr__: what about files that are being split?23:22
luke-jr__jelmer: that's more of a block-copy, unrelated but nice to add23:22
jelmerluke-jr__: I think copy tracking and how it should be implemented is perhaps better left until the moment people start working on it, it's a complex beast23:22
luke-jr__eg, splitting a file is on par with moving a funciton from a.c to (pre-existing) b.c23:23
=== fta_ is now known as fta
=== Kissaki is now known as Kissaki^0ff

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