/srv/irclogs.ubuntu.com/2007/12/26/#bzr.txt

=== me_too is now known as too_short
=== too_short is now known as me_too
ubotuNew bug: #178695 in bzr-cvsps-import "Problem when trying to import CVS module" [Undecided,New] https://launchpad.net/bugs/17869508:41
* ddaa starts looking at bzr-git08:48
ddaa> stgit is used to provide python parsing of the output of git commands.08:48
ddaagack! pyarch flashback!08:48
``Cubehas anyone received my mail?08:49
``Cubeddaa: ?08:49
ddaaIs that the quick hack it looks like, or is this the officially blessed way to bind to git?08:49
ddaa``Cube: using CLI spawning/parsing as a library binding is evil.08:50
``Cubehuh?08:50
``Cubejust asked about the icon mail08:50
``CubeI didn't get any feedback yet08:50
ddaadunno what you asked about, I just got in. This was an unrelated comment.08:51
``Cubeah ok :D08:51
``Cubewell, so I'll ask again: I sent a mail with icons08:51
``Cubedid you get it?08:52
``Cubesome days ago08:52
ddaaI have 4764 unread mails in my bzr folder.08:52
``CubeWOO08:52
``Cubelol nice08:52
``Cubecould you search for mine?08:53
ddaasubject?08:53
``Cubeone second, oki?08:53
``CubeIntroduction + Bazaar Icon Tango Remake08:53
ddaaThere's such an email08:54
ddaawith one giant png that collates a bunch of icon08:54
``Cubeheh ;)08:54
``Cubeyea08:54
``Cubethanks it08:54
``Cube*that's it08:54
ddaanot really usable as is08:54
``Cubehmm :S08:55
``Cubeit was just a propose08:55
``Cubehmm, you don't like it, ok08:55
``Cubelooks like its not gonna pass08:55
ddaaI am in no position to make a judgement about it.08:56
ddaaIt just looks kind of weird to me that you submit tango icons to upstream. Shouldn't this be packaging in the tango theme package, instead of bzr?08:56
``Cubewell, I wanted to replace the current icons with tango icons08:56
``Cubeon launchpad, the webpage and so on08:57
ddaa``Cube: Also, all the Canonical folks are on holiday ATM, so you should wait until January for an authoritative reply.08:57
``Cubeoh, ok08:57
``Cubebut you don't think they'll pass it?08:58
``Cubeby the way, the 16x16 isn't ready yet08:58
ddaaThey sure look nice. My private opinion is that they are too low-contrast for use as the main icons. But they are a great fit to tango-like themes.08:59
ddaaBut it's only my private opinion, the people in charge may very well think differently.09:00
``Cubeoh ok09:00
``CubeI mean, I can change them completely09:00
ddaacouple of things I do like09:00
``CubeI just tried to make them look close to the original ones09:00
ddaais the lack of drop-shadow under the arrow, and the square incoming road.09:01
ddaaPlease do not change them because of my feedback. Wait for authoritative feedback.09:01
``Cubeheh ;) ok sure09:02
``Cubewell, are the canonical very...09:02
``Cubelets say09:02
``Cubeprofessional?09:02
``Cubeor do they accept lil mistakes at the beginning09:02
``Cubeand similar stuff?09:02
ddaaBeing professional and being welcoming to new community contributors do not have to be mutually exclusive.09:03
``Cubehmm, you're right...09:03
``Cubewell ok, thanks a lot, ill wait until they come back09:03
``Cubein JAN09:03
``Cubeehm, do you have someones IM?09:04
``CubeI'd like to contact them personally09:04
``Cubebecause, if there are so many mails coming in09:04
``Cubemine will probably go under09:04
ddaaThat's okay. They know how to do deal with large amount of email. I'm sure you'll receive some attention.09:04
ddaaNagging is not a good idea at first. You did the right thing by posting to the mailing list and by asking here.09:05
ddaaBTW, this crowd tend to prefer pure-text email rather than HTML.09:06
ddaaJust for the future.09:06
``Cubehmm ok09:06
``Cubethanks09:06
``Cubebut someone with pure-text, can he receive my mails at all?09:07
ddaasure09:07
ddaathey include a text/plain mime part.09:07
``Cubeah, ok09:08
ddaathey do not look optimal (too many blank lines) but they are perfectly readable.09:08
``Cubeoh yes, heard about that blank line issue somewhere09:08
lifelessbeuno: there are plugins for eclispe and visual studio for bzr :))09:49
ddaahey lifeless09:50
lifelesshey ddaa, happy xmas stuff09:54
ddaathank, happy yours09:54
* ddaa had enough christmas for one year09:54
i386lifeless: :)10:01
i386merry xmas and all that crap :)10:02
lifelessi386: :)10:02
* ddaa went out to ask about binding in #git10:03
ddaathis really gives me very strong flashbacks of GNU Arch.10:03
ddaaI hope it's just my personal prejudice.10:04
lifelessgit is the new arch10:04
ddaaI'm fearing that much.10:04
ddaaThis notion scares the hell outta me.10:04
lifelesslibgit is internal only10:05
lifelessI investigated this when starting bzr-git10:05
lifelessanyhow, I'm not here ;), Just checking mail after 5 das without :)10:05
PengGit is the new Arch?10:10
ddaaApparently they seem to have this notion that "writing a library interface" is something you can slap over an existing codebase designed to be CLI-driven.10:16
ddaaAlthough my experience in this respect is limited to tla, I believe it's usually nowhere near that simple.10:16
ddaaSmall things like error reporting and resources handling you need not worry much about in small one-off processes are critical to making a good library API. And a huge pain in the ass to retrofit.10:17
ddaaThen "since nobody has bothered to do it, it's probably not all that useful"...10:18
ddaaGNU Arch had a way to twist people perceptions. I'm scared that similar things might be at work in the git community.10:19
ddaaNot, all of what I just said is my just my personal opinion.10:20
ddaaAnd not all that informed at that.10:20
ddaaIt seems that git failure modes are indeed consistent with my expectations...10:47
ddaa"Fails in mysteriously arcane way for trivial mistakes."10:47
PengHmm. Bzr and hg are written as libraries. That's kind of an advantage, huh?10:48
ddaaTrying to clone from something that's is not a git repo yields "fatal: Not a valid object name HEAD". That's git-speak for "Not a branch."10:48
PengSo they write error messages in code. What does that have to do with librarification? :)10:49
ddaatla tended to have the same error reporting issues10:49
ddaathings written to be a bunch a scripts seem to tend to suck at propagating error conditions and displaying meaningful context-sensitive messages.10:50
ddaaSo, then tend to resort to displaying low level errors to the user.10:51
PengIs doing it well in C harder than in Python?10:51
ddaaIt's not really a matter of language.10:51
PengOk.10:52
ddaaRather a matter of how people think about their software.10:52
ddaaThough, good error reporting is much harder in C than in Python. Exception was one of the great advances in programming languages that occured after C.10:55
ddaaBut it seems good C programmers are kind of used to setting up whole frameworks to give C things like exceptions, managed memory and run-time polymorphism. And I assume that git programmers are good C programmers.10:56
fullermdAll that stuff isn't important, though.  Fast is all that matters.11:19
ddaafullermd: always the troll, aren't you? :)11:20
fullermdI'm trying to reach my quota so I can leave my bridge for a few hours today.11:21
* ddaa gives fullermd a red herring11:21
* fullermd chops down a tree with it.11:21
ddaain monkey island, that used to make the bridge troll happy11:21
mathrickddaa: oh man, tla was horrible11:58
mathrick"ERROR: botched assertion (125)"11:58
mathrickthough it made me learn the word "botched", so it was useful in a way11:59
=== GaryvdM_ is now known as GaryvdM
ddaathat one usually meant some form of data corruption :)12:03
ddaain bzr you'd get a traceback in similar cases, which is only marginally better12:04
acusterHey all, with bzr-svn what's the difference between an initial 'bzr branch' and a 'bzr co'?12:17
GaryvdMacuster: branch can create a branch without a working tree.  checkout w12:27
GaryvdMcheckout allways creates a branch with a working tree12:28
* fullermd blinks.12:28
acusterokay, that makes sense12:28
GaryvdMcheckout is also used to create a working tree for a branch that does not have a working tree12:28
fullermdNot to me it doesn't...  is bzr-svn really so different from bzr?12:28
GaryvdMno12:28
acusterdo you know what format I should init-repo with for bzr-svn?12:28
fullermdThen the difference is that branch creates a branch, and co creates a checkout.12:29
GaryvdMAm I wrong fullermd?12:29
acusterfullermd, that may be entirely true but pedagogically, it's useless12:29
ddaaAhem12:29
ddaaOkay, so a checkout (heavy checkout) is just a branch.12:29
fullermdGrr.  No it's not, it's a checkout.12:30
* fullermd stabbies the branch.12:30
ddaaExcept it's "bound" to a master, and when committing to a checkout, changes are automatically pushed to the master, atomically.12:30
GaryvdMCheckout = branch + working tree?12:30
fullermdA branch gives you an independent branch to work on.12:30
datoGaryvdM, nope12:30
fullermdA checkout lets you work on the branch you point it at.12:30
bob2acuster: something with rich-root support (--rich-root or --rich-root-pack)12:30
ddaaGaryvdM: I am afraid you are confused.12:30
acusterbob2, thanks12:30
GaryvdMoh12:31
ddaaGaryvdM: what you call a checkout here is a lightweight checkout.12:31
ddaahello bob212:31
ddaalong time no see12:31
bob2he ddaa12:31
bob2er, hey.12:31
ddaaacuster: so, with bzr-svn, you only really want to use "bzr checkout" to create a branch that you will use only to merge your bzr work into the svn repository.12:32
ddaanote, that you can turn a "checkout" into a "branch" using "bzr unbind", and conversely using "bzr bind".12:33
ddaa(those are fairly obscure commands, but they are useful to illustrate that a heavyweight checkout is just a branch with some special behaviour)12:34
fullermdI still say that definition should die a quick and painful death.12:36
fullermdIt just makes everything more painful.  It's not a branch with special behavior, it's a checkout with special behavior.12:37
datoand what's a checkout without special behavior? :)12:38
fullermdNothing, any more than an internal-combusion motor without special behavior is anything.  Everything has attributes.12:38
fullermdHeavy and light are just two different kinds of checkouts with varying attributes and behaviors in edge cases.12:38
=== me_too is now known as too_short
=== too_short is now known as me_too
ubotuNew bug: #178722 in bzr "Wrong argument for "bzr log --timezone" triggers internal error" [Undecided,New] https://launchpad.net/bugs/17872213:00
=== me_too is now known as too_short
=== too_short is now known as me_too
ddaawhat's the trick to make "bzr selftest" and pdb go along?14:13
ddaaI stuck a "import pdb; pdb.set_trace()" in some method called from a test, but it seems pdb is confused by the test runner.14:14
=== me_too is now known as too_short
=== too_short is now known as me_too
ddaanevermind14:22
ddaait was my evil psyco plugin14:22
=== me_too is now known as too_short
=== too_short is now known as me_too
=== me_too is now known as too_short
=== too_short is now known as me_too
=== me_too is now known as too_short
=== too_short is now known as me_too
=== me_too is now known as too_short
=== too_short is now known as me_too
Poromenoshi, is there a way to change a commit message?14:38
datoPoromenos: nope14:39
datoPoromenos: well14:39
datoPoromenos: if it's the latest entry, and you haven't pushed to a remote place, you could uncommit, and commit again with a fixed message14:39
datobut other than that...14:39
Poromenosit's  not :/14:39
Poromenosah well, thanks anyway14:40
Poromenosis there a way/need to specify dependencies on a project on launchpad?14:41
ddaaah, I found how to fix the test suite on jam's branch.14:48
ddaaIt seems that git-fast-import --export-marks=foo now actually changes the foo file instead of just writing to it (hardlink breaking), so it defeats the use of NamedTemporaryFile in the GitBranchBuilder.14:49
* ddaa grumbles14:49
ddaathat's the kind of stupid shit you get when trying to bind to a CLI14:50
acustergrrr 1000 of 7300 and already at 61% cpu,14:51
``Cubeoh no14:51
acusterno way to branch that svn repo14:51
``Cubeincredible14:52
acusterwell, let's run until we crash.14:52
acusterDoes bzr still have know memory leaks?14:52
=== me_too is now known as too_short
=== too_short is now known as me_too
=== me_too is now known as too_short
=== too_short is now known as me_too
jelmeracuster: It's subversion15:02
jelmerThere was a huge memory leak in the subversion python bindings15:02
acusterhey jelmer15:02
jelmerhttp://subversion.tigris.org/issues/show_bug.cgi?id=305215:03
acusterthanks15:04
jelmerhi ``Cube15:13
``Cubehi15:13
=== me_too is now known as too_short
=== too_short is now known as me_too
ddaajelmer: I think the SvnRaTransport docstring "This implements just as much of Transport as is necessary to fool Bazaar." is a tad bit outdated now :)15:44
jelmerheh, good point :-)15:44
ddaawas looking for a template transport to define a git:// transport15:45
jelmerah, working on bzr-git ?15:48
ddaajust some holiday hacking15:50
ddaabest way to benchmark against git would be having a working bzr-git in the first place15:52
ddaaalso, git is not going to away anytime soon, so it will be useful, and help some ubuntu folks that need to deal with git upstreams.15:53
jelmersame here16:02
jelmernow that Samba has switched to git, it would be very nice to see a working bzr-git16:02
fullermdThink it'll be good and usable in 6 months, say?16:04
ddaathere are some unique challenges16:04
ddaasuch as dealing with git's approach of guessing renames instead of recording them16:05
ddaathat assumes the intelligence is in the commands, not in the data.16:05
ddaaThat clashes quite badly with the bzrlib design.16:05
fullermdI just need a planning number, so I can figure out when it'll be time to get samba to switch to the next VCS I want foreign branch support for   ;)16:05
=== me_too is now known as too_short
=== too_short is now known as me_too
ddaaIt seems quite unlikely to me that anybody would switch away from git to anything but svn or bzr.16:06
ddaadepending on where they put the blame for the pain they endured.16:07
=== me_too is now known as too_short
=== too_short is now known as me_too
ddaawhat's this me_too thing?16:08
=== me_too is now known as too_short
=== too_short is now known as me_too
fullermdCan't see.  too_short.16:10
=== me_too is now known as too_short
=== too_short is now known as me_too
=== me_too is now known as too_short
=== too_short is now known as me_too
=== me_too is now known as too_short
=== too_short is now known as me_too
jelmerddaa: As long as the plugin always detects renames at the same places, there's no problem :-)16:18
ddaaI mean that git has a lot of freedom to evolve their rename-guessing logic16:19
ddaabut a bzr-git plugin would be much more constrainted16:20
fullermdYeah.  They've got all the time in the world to try and come up with a herustic to figure out the information that the user could just provide at the time   :p16:21
jelmerddaa: yup16:30
jelmerpath tokens ftw!16:30
ddaawhat's that?16:30
* ddaa is hopelessly out of touch16:30
jelmerreplacement for fileids proposed by robert16:30
ddaagotta be interesting16:30
jelmermeant to solve parallel imports and copy tracking16:30
jelmeryeah, the idea is very interesting16:31
jelmerbut it's also quite abstract at this point16:31
jelmerhttp://bazaar-vcs.org/DraftSpecs/PathTokens16:31
ddaaI regard git's support for parallel imports a very strong point for them.16:33
* ddaa reads the spec16:33
fullermdgit doesn't lack in strong points.  Now, if it lacked a bit more in nuttiness...16:34
fullermdThe content-addressed storage is certainly a strong point.16:35
ddaaI've always felt utterly nonplussed by this.16:35
fullermdAnd I get to like the crypto-hash-as-revid concept better the longer I think of it.16:35
ddaareally, we only have identity problems in bzr because of limitations in how we deal with parallel imports.16:36
ddaaand content-addressing has some major drawbacks16:36
fullermdIt's got major advantages too.16:37
ddaaas in making it pretty much impossible to have native checkout for foreign repository formats.16:37
fullermdThough I see it as fairly orthogonal to the identity issue (at least, insofar as I'd mentally want to take it; file texts)16:37
ddaamh... this spec is pretty light on actual ideas16:39
ddaait's just a problem statement16:39
ddaajelmer: why does bzr-svn uses BOTH BzrDirFormat.register_control_format AND format_registry.register to register SvnRemoteFormat?16:42
jelmerHmm, you're right, that's confusing..16:44
ddaaI guess that means only format_registry is needed, right?16:44
jelmerNo, I think the first one is for the handling of ".bzr"16:45
jelmers/.bzr/.svn16:45
jelmerwhile the latter is usually a combination of a branch, repository and working tree format16:45
ddaaBzrDirFormat.register_control_format(format.SvnRemoteFormat)16:45
jelmer"dirstate-with-subtree"16:45
ddaathat is not .svn stuff16:45
jelmerthat's the remote stuff16:45
jelmerdetecting the control dir happens by checking whether the transport is a SvnRaTransport16:45
ddaaright16:46
jelmerrather than checking for a .svn directory16:46
ddaabut then16:46
ddaaformat_registry.register("subversion", format.SvnRemoteFormat,16:46
ddaa                         "Subversion repository. ",16:46
ddaa                         native=False)16:46
jelmerthe format registry bit is just so it appears in the output of "bzr init --help"16:46
ddaaok16:47
jelmerand so info knows how to call it16:47
Poromenosfor some reason i can't branch from https, (launchpad), curl is giving me an error. any ideas?16:50
ddaacouple of them16:51
ddaaeither use the actual http or bzr+http address of the branch16:51
ddaahttps://code.launchpad.net is just a redirection to http://bazaar.launcphad.net16:52
Poromenosit redirects16:52
Poromenoshmm16:52
ddaaor do not use curl16:52
Poromenosi'm not doing it intentionally, bazaar is16:52
Poromenoshttp://bazaar.launchpad.net/gnuhello isn't working16:54
ddaayou can use https+urllib:// urls to stop it from using pycurl16:54
Poromenosnot a branch, actually16:54
Poromenosah16:54
ddaaor you can uninstall pycurl if nothing else is using it on your system16:54
Poromenosi don't think anything is, i'll try that, thanks16:54
ddaabtw, this url is indeed not a branch16:55
Poromenosas an aside, do you know how i can generate ssl keys?16:55
Poromenosyes, but launchpad.net/gnuhello is16:55
ddaacheck https://code.edge.launchpad.net/~vcs-imports/gnuhello/trunk16:55
ddaayou'll see the download URL there16:55
Poromenosah, urllib worked, thanks though16:55
ddaathe redirection magic only happens on code.launchpad.net, not on bazaar.launchpad.net16:55
Poromenosah16:56
ddaaPoromenos: the command is ssh-keygen, if you are on linux16:56
ddaaif you are on Windows, I have no clue.16:56
Poromenosi'm on ubuntu, thanks16:57
ddaaPoromenos: I'm pretty sure there is extensive documentation about this stuff on help.launchpad.net16:57
Poromenosi can't find it, i'm following the tutorial but i couldn't find help on either the tutorial or the ssl keys page16:57
Poromenosssh, i mean16:58
ddaaok16:58
ddaamaybe file a bug on launchpad-bazaar then16:58
ddaathis sort of thing should be crystal clear.16:58
Poromenosi will, thanks16:58
Poromenoscan i delete a branch after i publish it?17:09
Poromenos(on launchpad)17:09
datojelmer: did you see my mail about bzr-plugins?17:29
jelmerdato: no that I remember - where did you send it?17:29
datobazaar@ and -maint17:30
* jelmer has a look17:30
GaryvdMIf I ran bzr-gtk's ./setup.py install - is there a way to uninstall?17:31
Poromenoscan anyone ssh to bazaar.launchpad.net?17:52
Poromenosit's not working for me17:52
ddaathe shell is disabled17:52
Poromenosoh17:52
Poromenostemporarily?17:52
ddaapermanently17:52
Poromenoshow do people upload code then?17:53
ddaabzr push17:53
Poromenospush where...17:53
ddaato the bzr+ssh url displayed on the branch page of a hosted branch17:53
Poromenosthat's what's not working17:54
Poromenoshttps://code.launchpad.net/~stavrosk/gmailchecker/main17:54
ddaaplease paste the bzr command you typed and the output it produced17:54
Poromenosbzr push bzr+ssh://stavrosk@bazaar.launchpad.net/~stavrosk/gmailchecker/main17:54
Poromenosssh: connect to host bazaar.launchpad.net port 22: Connection refused17:55
Poromenosthat's it17:55
ddaameh17:55
ddaaindeed, it's down17:55
datoNext mirror:17:56
Poromenosah17:56
datoAs soon as possible17:56
datoheh17:56
Poromenosi'll wait then, thanks17:56
Poromenoscan i name a branch?17:56
Poromenosi mean in bzr17:56
Poromenosprobably not, nm17:56
ddaanot sure what you mean17:56
ddaayou can specify a branch nick that will be recorded in commits17:56
ddaaotherwise, the name of a branch is its url17:57
ddaayou can change the last past of a branch url on launchpad17:57
ddaa"Edit branch details", it's the branch name field.17:57
Poromenosi just saw "branch name" on the web interface, but i realized it's what you enter17:57
Poromenosyes, thanks17:57
kripken__Since an hour ago I get an error when I try to use bazaar to update my branches on launchpad, "connection refused: please check connectivity and permissions". Any idea how to do that? (it says "try -Dhpss", but that doesn't help)18:13
ddaaapparently the ssh server is down18:29
ddaathere should be a nagios alarm ringing right now18:29
foomare there any speed improvements on the horizon? bzr still (1.0; rich-root-pack source format) seems to be unusably slow (20 minutes, local disk) at making a branch of a 40krev repository.18:31
luksthe trick is to use shared repositories18:32
ddaaright, you don't want to duplicate 40krevs of data anyway18:33
ddaaaside from the fs bloat, it does not allow efficient use of the disk caches.18:33
foomsure, that's a nice trick when it works. but it doesn't work in all situations, and 20 minutes is *reaaaallly* long.18:34
jelmerhi foom18:34
lukshm, what are the situations when it doesn't work?18:34
foomjelmer: hey there18:35
foomluks: branching a remote repository, for example.18:35
kripken__ddaa: thanks for the info18:35
luksfoom: but you do that only once, and never again18:36
luksnot such a big problem, IMO18:36
luksnext time you branch you have most of the data locally18:36
ddaaluks: normally, remote branch should be essentially limited by how fast you can pump data off the server. Anything else is a bug.18:37
ddaaalthough it is planned to have shallow branches in the future18:37
luksddaa: yes, but without a shared repository you download it over and over again18:37
ddaaso you won't HAVE to pump all the history of the server to make a local branch.18:38
lukswhich is that I guess foom is doing18:38
lukser, s/that/what/18:38
foomluks: well, okay, you've got me, if this was the only slow thing in bzr, I guess that might be okay. I dunno if it is or not, it's just the first thing I've tested this go-around.18:38
foomand it seems quite unlikely that this would be the only too-slow operation18:38
ddaabzr is certainly not as fast as some of the competition, but using the most recent formats, it should be fast enough.18:39
ddaai.e. the time should be a small multiple of the time of other tools, not orders of magnitudes slower as it used to be.18:40
ddaaWe think it's more important to have "merge" and "commit" be reliable and easy to use, than to have them run in 0.5 second instead of 2 seconds.18:41
luksthe most annoying thing to me is not the actual performance, but the startup time18:41
foomjelmer: i saw you found the (a?) memory leak in svn python bindings and said you worked around it in bzr-svn; is that workaround expected to not be a full fix?18:41
jelmerfoom: Yes, it isn't a full fix18:41
foomjelmer: okay, cause bzr crashed my machine converting a svn repository by running it out of memory and invoking the OOM killer which killed half the important processes. :(18:42
jelmerfoom: You need an updated version of the python-subversion bindings for all of the memory leaks to go away18:42
foom"hey look, X is taking some memory, let's kill it!". thanks linux...heh18:42
jelmerhttp://subversion.tigris.org/issues/show_bug.cgi?id=305218:42
foomthat's not patched in ubuntu yet is it?18:43
foomluks: startup time?18:47
foomand...'bzr log -r20000' takes 23s.18:54
ddaajelmer: it seems pretty much impossible to implement a transparent git:// transport18:57
ddaashort of reimplementing the client code18:57
ddaacommon git servers only expose git-fetch-pack and git-peek-remote services18:57
ddaaand the former requires a local git dir18:58
* ddaa finds this frustratingly limited18:59
ddaayay! git_connect dies on error :(19:21
jelmerddaa: Are you working based on stgit?19:24
ddaajelmer: I'm based on jam's branch19:24
ddaait has no stgit dependency19:24
ddaaand right now, I'm staring at the git source itself19:24
ddaaand all my fears are confirmed19:24
jelmer:-/19:27
ddaaif (protocol == PROTO_GIT) {19:27
ddaa/* These underlying connection commands die() if they19:27
ddaa * cannot connect.19:27
ddaa */19:27
ddaaAlso, all the network code seems to assume that sockets and pipe and interchangeable19:28
ddaai.e. forget about windows19:28
ddaaAt least some of the client code will have to be written from scratch.19:29
ddaaor heavily patched.19:29
jelmerddaa: You're writing this in C or Python?19:36
ddaajust explorating19:36
ddaaActually, I think I'm going to give up on the transparent transport.19:36
jelmerI thought Robert already had a lot of this done19:40
ddaathe bzr-git code I see is quite proof-of-concept19:40
ddaaand it only works locally19:40
ddaai.e. it does not try to do more than git19:40
ddaawhich pretty much only knows how to fetch packs over the network, then does everything locally.19:41
jelmerah, ok19:45
ddaaunfortunately, I do not think that's an acceptable level of functionality for bzr :(19:45
ddaaHey, bazaar.launchpad.net SFTP server is up again20:07
piedoggieI just started reading the user documentation and I am damned impressed.21:02
piedoggieit is the clearest description I have ever seen up any revision control system.21:02
* piedoggie thinks everybody is out at Boxing Day parties21:03
eddyMulhi. I have a bzr branch in my ${HOMEDIR}. I also have another bzr branch in my ${HOMEDIR}/Desktop/vision/proj2/. If I want to graft/merge proj2 to ${HOMEDIR}, should I use `bzr merge`?23:39
=== Verterok_ is now known as Verterok
VerterokeddyMul: take a look to the merge-into plugin <https://launchpad.net/bzr-merge-into/>, might be helpful.23:50
eddyMulThanx, Verterok. Will look at it23:50
eddyMulVerterok: looks like this is what I'm looking for. There's a bug againts bzr-0.90. Do I need bzr-1.0?23:52
VerterokeddyMul: it's seems is broken :(23:53
Verterokit's broken against bzr.dev, probably it won't work with 1.023:54
eddyMulVerterok: when I try merging, it kept complaining "bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified."23:55
eddyMulwhich sounds about right23:55
eddyMulwhen I specify the revisions (there are 5 revs) -r1..5, bzr bombs w/ AssertionErrors23:56
eddyMul:(23:56
VerterokeddyMul: I just found find-merge-base command, it's part of the hidden commands, take a look to that maybe it can help you to find a base revision to merge23:57
spiveddyMul: you can try "-r0..5"23:58
spiveddyMul: also, there's a "bzr join" command, but it's still experimental.23:59
Verterokspiv: thx for the r0..x tip :-)23:59

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