| === Starting logfile irclogs/bzr.log | ||
| === ubuntulog [i=ubuntulo@ubuntu/bot/ubuntulog] has joined #bzr | ||
| === Topic for #bzr: The Bazaar Version Control System | http://bazaar-vcs.org/ | Bazaar 0.90rc1 is out - http://bazaar-vcs.org/releases/src/bzr-0.90rc1.tar.gz | ||
| === Topic (#bzr): set by james_w at Wed Aug 15 01:21:14 2007 | ||
| === fabbione [i=fabbione@gordian.fabbione.net] has joined #bzr | ||
| fabbione | test | 06:48 |
|---|---|---|
| fabbione | good :) | 06:48 |
| === fabbione [i=fabbione@gordian.fabbione.net] has left #bzr ["Ex-Chat"] | ||
| lifeless | kthxbye | 06:50 |
| === jml_ is now known as jml | ||
| === AfC [n=andrew@office.syd.operationaldynamics.com] has joined #bzr | ||
| === Peng_ [n=mnordhof@fl-69-69-138-91.dyn.embarqhsd.net] has joined #bzr | ||
| === brmassa [n=brmassa@201-26-122-165.dsl.telesp.net.br] has joined #bzr | ||
| brmassa | guys, i forgot to redit my personal info when reinstalled my system and now some commits are considered as another person. how can i fix it? | 07:38 |
| Peng_ | brmassa: Uncommit them. | 07:40 |
| Peng_ | Unfortunately. | 07:40 |
| brmassa | !!! really? | 07:41 |
| ubotu | Sorry, I don't know anything about really? - try searching on http://bots.ubuntulinux.nl/factoids.cgi | 07:41 |
| === Peng_ is now known as Peng | ||
| Peng | Haha. Nice, ubotu. | 07:41 |
| === Lo-lan-do [n=roland@mirenboite.placard.fr.eu.org] has joined #bzr | ||
| Lo-lan-do | Hi all | 08:10 |
| === poolie [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr | ||
| Lo-lan-do | I'll paste this http://paste.debian.net/35561 now, in order not to lose the URL for when jelmer comes around. | 08:14 |
| lifeless | brmassa: yes, we don't support editing commits; doing that essentiall changes data that is meant to be irrevocable. | 08:17 |
| brmassa | hmmm | 08:17 |
| brmassa | i was thinking about "merging commiters" or alias... | 08:18 |
| brmassa | something like this... | 08:18 |
| === mvo [n=egon@p54A67BEC.dip.t-dialin.net] has joined #bzr | ||
| Lo-lan-do | lifeless: Irrevocable, but still uncommittable :-) | 08:21 |
| brmassa | lifeless, i saved my gpg on my pendrive. once i reinstalled my ubuntu, how can i import them back? launchpad keeps complaining.. | 08:22 |
| fullermd | Well, uncommit doesn't revoke it. It just deports it ;) | 08:22 |
| lifeless | brmassa: uhh, dunno what you mean | 08:25 |
| lifeless | mvo: grats | 08:25 |
| mvo | hey lifeless, thanks | 08:25 |
| kanhaiya_kk | NamNguyen: Hi | 08:34 |
| kanhaiya_kk | good morning | 08:34 |
| === allenap [n=allenap@212.233.37.68] has joined #bzr | ||
| NamNguyen | kanhaiya_kk: hello | 08:36 |
| kanhaiya_kk | Actually , yesterday due to network prob. i cant clear my points | 08:46 |
| kanhaiya_kk | NamNguyen: i tried this "bzr check http://192.168.10.16/~ignu/water" from .17 m/c | 08:49 |
| === hmeland [i=29578@klodrik.uio.no] has joined #bzr | ||
| kanhaiya_kk | NamNguyen: but how to open that file here ? | 08:49 |
| NamNguyen | kanhaiya_kk: what file? | 08:49 |
| kanhaiya_kk | means any file from water dir. ? | 08:50 |
| NamNguyen | kanhaiya_kk: bzr check is different from bzr checkout | 08:50 |
| NamNguyen | please try again with bzr checkout | 08:50 |
| kanhaiya_kk | okay wait | 08:51 |
| kanhaiya_kk | NamNguyen: yes, now i can edit file.. | 08:52 |
| NamNguyen | good | 08:52 |
| kanhaiya_kk | after this i have to do bzr commit and then bzr rspush na ? | 08:52 |
| === AfC [n=andrew@office.syd.operationaldynamics.com] has joined #bzr | ||
| === dato [n=adeodato@84.120.248.23.dyn.user.ono.com] has joined #bzr | ||
| kanhaiya_kk | NamNguyen: but then also i have confusion. before i tried bzr branch on .17 machine and now im trying bzr checkout. what is the difference in both commands ? | 08:56 |
| lifeless | branch makes a new line of developemnt, checkout works on the existing branch like svn or cvs do | 08:57 |
| NamNguyen | kanhaiya_kk: one follows centralised model, the other (branch) follows decentralised model | 08:57 |
| kanhaiya_kk | okay..means bzr checkout is right for me. | 08:58 |
| kanhaiya_kk | good | 08:58 |
| kanhaiya_kk | but still....one sec | 08:58 |
| AfC | Unless, of course, you don't have write access to the branch you're checking out, in which case you end up doing decentralized development anyway. | 08:58 |
| === g0ph3r [n=g0ph3r@p57A0B5B8.dip0.t-ipconnect.de] has joined #bzr | ||
| lifeless | NamNguyen: uhm, thats a confusing way to describe it. Because in a cental model using 'branch' is the way to make a new (centralised) branch. | 08:59 |
| kanhaiya_kk | sorry.....confusion is increasing | 08:59 |
| NamNguyen | lol | 08:59 |
| kanhaiya_kk | :( | 09:00 |
| lifeless | NamNguyen: 'branch' is useful in both centralised and decentralised scenarios. 'checkout' is also useful in both workflows though it is strongly biased towards centralisation. | 09:00 |
| kanhaiya_kk | after checkout.and after doing editing.when i do commit...it is giving me some errors. | 09:00 |
| kanhaiya_kk | some write_lock errors. | 09:00 |
| NamNguyen | lifeless: branch is not necessary after you have a bzr init on the working dir, am i correct? | 09:01 |
| lifeless | NamNguyen: EPARSE | 09:01 |
| spiv | kanhaiya_kk: right, HTTP is read-only. | 09:01 |
| AfC | Yet another one burned by read only checkouts. {sigh} | 09:01 |
| kanhaiya_kk | so how should i commit changes to my main servere ? | 09:01 |
| AfC | kanhaiya_kk: if you don't mind being adventurous and learning a few new concepts, | 09:01 |
| kanhaiya_kk | hmmm | 09:01 |
| lifeless | kanhaiya_kk: SFTP probably is easiest. | 09:02 |
| NamNguyen | kanhaiya_kk: use sftp | 09:02 |
| kanhaiya_kk | im ready for anything...actually, here im learning very new things | 09:02 |
| lifeless | kanhaiya_kk: use a SFTP URL to your branch. | 09:02 |
| kanhaiya_kk | means no commit...directly sftp | 09:02 |
| kanhaiya_kk | ? | 09:02 |
| NamNguyen | kanhaiya_kk: you tried to use http://192.168.xxx.16/~ignu/water | 09:02 |
| AfC | kanhaiya_kk: wait a sec - a) is this an existing public project or are you starting fresh, b) do you have ssh access to the server in question | 09:02 |
| AfC | ? | 09:02 |
| NamNguyen | now try it with sftp://192.xxx.xxx.16//home/~ignu/water | 09:03 |
| NamNguyen | erm, i missed a public.html in that URL | 09:03 |
| lifeless | a better usel might be sftp://192.168.xxx.16/~/public_html/water | 09:03 |
| AfC | lifeless: sftp assumes ssh privs, right? So why would you not recommend bzr+ssh:// ? | 09:03 |
| lifeless | AfC: less dependencies. | 09:03 |
| kanhaiya_kk | NamNguyen: i tried this bzr rspush sftp://192.168.10.16/~/public_html/water | 09:04 |
| kanhaiya_kk | but getting error bzr: ERROR: Invalid rsync path u'sftp://192.168.10.16/~/public_html/water/'. | 09:04 |
| lifeless | AfC: don't need bzr installed on the remote end. This is therefore easier to get started, and bzr+ssh can be added in easily. | 09:04 |
| fullermd | Well, he's got bzr on the server since he's (or was the other day) update'ing the WT there. | 09:04 |
| kanhaiya_kk | AfC: yes this is existing project and ssh is also working | 09:05 |
| lifeless | fullermd: I don't know these thigns :) | 09:05 |
| AfC | ~ doesn't work over the wire, does it? As I recall, you need to use absolute path names | 09:05 |
| fullermd | lifeless: Well, you have a life, and don't watch IRC all night ;) | 09:05 |
| lifeless | AfC: sftp://host/~/foo works. | 09:05 |
| lifeless | I believe its documented in bzr help | 09:05 |
| AfC | lifeless: how about that | 09:05 |
| lifeless | we treat /~/ as 'dont cd at the remote end' | 09:05 |
| fullermd | Yah. bzr+ssh doesn't interpolate ~'s, but sftp does. | 09:05 |
| === fullermd stabbies bzr+ssh a few times. | ||
| === AfC finds having sftp actually working a bigger "dependency" than installing bzr on the target server, so has never used it | ||
| lifeless | AfC: sftp is on by default if ssh is IME | 09:06 |
| AfC | Probably just gun shy from the bad old days. Certainly ssh.com's ssh2 didn't have it on by default, and it was a pain in the ass to get working | 09:07 |
| NamNguyen | kanhaiya_kk: sorry i've never used rspush, my guess is your URL could probably be changed to rsync://... instead of stfp:// if you're going to use rsync? | 09:07 |
| AfC | Whatever - never would need to use sftp anyway, given the fact that I can invoke the server via ssh | 09:07 |
| === jrydberg__ [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr | ||
| spiv | kanhaiya_kk: why are you using "rspush" instead of "push"? | 09:09 |
| lifeless | AfC: oh yes well. openssh for th win :) | 09:09 |
| AfC | lifeless: indeed. | 09:10 |
| AfC | kanhaiya_kk: any luck writing to an sftp:// URL yet? | 09:11 |
| NamNguyen | kanhaiya_kk: bzr checkout sftp://192.168.xxx.16/~/public_html/water | 09:11 |
| === troy_s [n=aphorism@d206-116-6-170.bchsia.telus.net] has joined #bzr | ||
| AfC | spiv: because he has a certain plugin package installed, which vastly inflates the command namespace, which causes new users to agonize over which command they're supposed to use, which inevitably leads to people not realizing a) what the core commands were and b) that they had all the power needed all along | 09:12 |
| spiv | AfC: thanks for answering the meta-question ;) | 09:13 |
| === Peng_ [n=mnordhof@fl-69-69-138-14.dyn.embarqhsd.net] has joined #bzr | ||
| fullermd | Or perhaps because he was pointed at it because of his desire to have an up-to-date WT on the server. | 09:14 |
| === Peng__ [n=mnordhof@fl-69-69-138-14.dyn.embarqhsd.net] has joined #bzr | ||
| AfC | fullermd: that certainly would be a useful capability. I was quite saddened when I was told by the developer that it would never be included in bzr, even though it seems a natural thing to do automatically and transparently if you already have bzr+ssh as a transport. | 09:15 |
| === Peng__ is now known as Peng | ||
| === sverrej [n=sverrej@pat-tdc.opera.com] has joined #bzr | ||
| === Peng_ [n=mnordhof@fl-69-69-140-236.dyn.embarqhsd.net] has joined #bzr | ||
| === Peng__ [n=mnordhof@fl-69-69-142-64.dyn.embarqhsd.net] has joined #bzr | ||
| === Peng [n=mnordhof@fl-69-69-141-247.dyn.embarqhsd.net] has joined #bzr | ||
| Peng | Holy crap. You know that file bzr takes like 35 seconds to diff? Hg takes 8. | 09:59 |
| === asac_ [n=asac@debian/developer/asac] has joined #bzr | ||
| === Peng_ [n=mnordhof@fl-69-69-140-217.dyn.embarqhsd.net] has joined #bzr | ||
| poolie | Peng, it would be interesting if you could merge that C patience diff patch recently posted and measure that | 10:13 |
| Peng_ | poolie: Yeah, it would probably help. | 10:16 |
| Peng_ | I have to admit I just Tailored that branch over to hg, and the .bzr repo is on another partition, but I could check it. | 10:16 |
| === Peng_ wanders off. | ||
| === Peng_ is now known as Peng | ||
| === markvandenborre [n=mark@ubuntu/member/markvandenborre] has joined #bzr | ||
| === igc dinner | ||
| === Zindar [n=erik@stockholm.ardendo.se] has joined #bzr | ||
| === ddaa [n=david@canonical/launchpad/ddaa] has joined #bzr | ||
| === asabil [n=asabil@62.70.2.252] has joined #bzr | ||
| === sverrej_ [n=sverrej@pat-tdc.opera.com] has joined #bzr | ||
| === sverrej [n=sverrej@pat-tdc.opera.com] has joined #bzr | ||
| === ajmitch [n=ajmitch@port166-123.ubs.maxnet.net.nz] has joined #bzr | ||
| ubotu | New bug: #135234 in bzr "Checkout should record relative paths (dir move problem)" [Undecided,New] https://launchpad.net/bugs/135234 | 11:16 |
| === jnair [n=jayesh@203.123.188.10] has joined #bzr | ||
| === glogiotatidis [n=seadog@ppp85-111.adsl.forthnet.gr] has joined #bzr | ||
| glogiotatidis | hello | 11:34 |
| glogiotatidis | is everyone available to help me with a prob? | 11:34 |
| glogiotatidis | everyone = anyone ;) | 11:35 |
| glogiotatidis | I am using bzr push sftp://host/path to push a repo | 11:36 |
| glogiotatidis | and bzr claims to have commited a branch | 11:36 |
| glogiotatidis | but only .bzr exists on host/path | 11:36 |
| glogiotatidis | am i doing something wrong? | 11:36 |
| fullermd | No, that's what's supposed to happen. | 11:38 |
| fullermd | (you _are_ pushing a branch, not a repo) | 11:38 |
| glogiotatidis | but if I bzr push /tmp/site pushes everything | 11:39 |
| glogiotatidis | when I use sftp acts like this | 11:39 |
| Kinnison | The sftp transport does not support working trees | 11:39 |
| Kinnison | where the local file transport does | 11:39 |
| fullermd | Local pushes will create working trees, because it's reasonable to manage them that way. Remotely, it's not. | 11:40 |
| Kinnison | so pushing over sftp will not update/create a working tree | 11:40 |
| glogiotatidis | ok and how can I push a dir remotely? | 11:40 |
| Kinnison | a dir? | 11:40 |
| Kinnison | Do you mean with working tree? | 11:41 |
| glogiotatidis | yes | 11:41 |
| === Kinnison can think of ways to bodge it, but nothing official | ||
| Kinnison | You could ssh to the machine afterwards and do a bzr update | 11:41 |
| fullermd | The nearest official way would just be to use bzr on the server to co/update it, either manually or via a hookish method like push-and-update. | 11:41 |
| glogiotatidis | hmm I got it | 11:42 |
| glogiotatidis | what I want to do is to update my website on my hosting provider | 11:44 |
| glogiotatidis | is there a way you use to do that? (maybe better than this?) | 11:44 |
| fullermd | Well, my websites get updated via make(1) and install(1)... | 11:45 |
| fullermd | If you've got shell access and bzr installed there, the above will work. Failing that, rsync is probably your easiest bet. | 11:46 |
| glogiotatidis | ok I will try this, thanks for your help! | 11:48 |
| === yoavb [n=yoavb@212.150.149.162] has joined #bzr | ||
| === bac_afk [n=bac@rrcs-67-79-191-211.se.biz.rr.com] has joined #bzr | ||
| === bac_afk is now known as bac | ||
| === AfC [n=andrew@office.syd.operationaldynamics.com] has joined #bzr | ||
| yoavb | hi, I installed bzr v0.15 and am trying to migrate my svn repository to it using svn2bzr.py (v0.6) | 12:02 |
| AfC | yoavb: step 1: upgrade to bzr >= 0.18. | 12:03 |
| yoavb | I got deprecation errors and then crashed, should it resolve this? | 12:04 |
| yoavb | This was the error: ./svn2bzr.py:426: DeprecationWarning: bzrlib.branch.initialize was deprecated in version 0.8. | 12:05 |
| yoavb | os.makedirs(branch_path) | 12:05 |
| yoavb | ./svn2bzr.py:91: DeprecationWarning: bzrlib.branch.BzrBranch5.working_tree was deprecated in version 0.8. | 12:05 |
| yoavb | branch.__wt = branch.working_tree() | 12:05 |
| yoavb | Traceback (most recent call last): | 12:05 |
| yoavb | File "./svn2bzr.py", line 575, in ? | 12:05 |
| yoavb | if __name__ == "__main__": | 12:05 |
| yoavb | File "./svn2bzr.py", line 568, in main | 12:05 |
| yoavb | svn2bzr(dump_file, opts.args[1] , creator_class, | 12:05 |
| yoavb | File "./svn2bzr.py", line 501, in svn2bzr | 12:05 |
| yoavb | File "./svn2bzr.py", line 362, in run | 12:05 |
| yoavb | elif node_kind == "dir": | 12:05 |
| yoavb | File "./svn2bzr.py", line 428, in add_dir | 12:05 |
| yoavb | self._branches[unpref_path] = branch | 12:05 |
| yoavb | File "./svn2bzr.py", line 91, in _new_branch | 12:06 |
| yoavb | branch.__wt = branch.working_tree() | 12:06 |
| yoavb | File "/usr/lib/python2.4/site-packages/bzrlib/symbol_versioning.py", line 121, in decorated_method | 12:06 |
| yoavb | return callable(self, *args, **kwargs) | 12:06 |
| yoavb | File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 1486, in working_tree | 12:06 |
| yoavb | raise NoWorkingTree(self.base) | 12:06 |
| yoavb | bzrlib.errors.NoWorkingTree: No WorkingTree exists for file:///tmp/repository/butils/. | 12:06 |
| lifeless | yoavb: please use a paste bin rather than pasting such things in the discussion channel. Also read what AfC said to you. | 12:06 |
| === gabe_ [n=gabriel@91.84.56.254] has joined #bzr | ||
| lifeless | night all | 12:07 |
| mwhudson | night lifeless | 12:12 |
| === NamNguyen [n=namnt@cm246.delta196.maxonline.com.sg] has joined #bzr | ||
| === LeoNerd [n=leo@cel.leonerd.org.uk] has joined #bzr | ||
| === mvo_ [n=egon@p54A6692D.dip.t-dialin.net] has joined #bzr | ||
| === Hattory [i=darkrad@host180-132-dynamic.15-87-r.retail.telecomitalia.it] has joined #bzr | ||
| Hattory | hi, I wanted to know as I can contribute to the translation of the Italian homepage: http://bazaar-vcs.org/PaginaIniziale | 12:36 |
| Hattory | There are some errors | 12:36 |
| === ollie [n=orutherf@dsl092-164-022.wdc2.dsl.speakeasy.net] has joined #bzr | ||
| === g0ph3r [n=g0ph3r@p57A0ADBA.dip0.t-ipconnect.de] has joined #bzr | ||
| Odd_Bloke | What's the accepted way of sanitising Unicode strings so they can be displayed on an ascii-encoded output? | 12:39 |
| === jelmer [n=jelmer@a62-251-123-16.adsl.xs4all.nl] has joined #bzr | ||
| === mvo_ is now known as mvo | ||
| === quicksil1er is now known as quicksilver | ||
| === Hattory [i=darkrad@host180-132-dynamic.15-87-r.retail.telecomitalia.it] has left #bzr ["Ex-Chat"] | ||
| === sabdfl [i=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
| === Hattory [i=darkrad@host180-132-dynamic.15-87-r.retail.telecomitalia.it] has joined #bzr | ||
| Hattory | i want to edit the italian homepage.... i can take as reference the English hompage? I can translate all? | 01:38 |
| AfC | Hattory: (unless the page itself is locked,) the Bazaar website is a wiki so you can just go ahead and edit it | 01:50 |
| Hattory | it's open ;D....... i look other hompage (fr, ja ecc...) and they have not translate all.... therefore I wanted to know what I could make | 01:55 |
| Hattory | Therefore I can write every thing? | 01:56 |
| === bac [n=bac@canonical/launchpad/bac] has joined #bzr | ||
| === Zindar_ [n=erik@stockholm.ardendo.se] has joined #bzr | ||
| === cprov [n=cprov@canonical/launchpad/cprov] has joined #bzr | ||
| === xxxxx1 [n=xxxxx1@146037.fln.virtua.com.br] has joined #bzr | ||
| === xxxxx1 is now known as deadwill | ||
| === jelmer [n=jelmer@a62-251-123-16.adsl.xs4all.nl] has joined #bzr | ||
| === deadwill is now known as xxxxx1 | ||
| === Zindar [n=erik@stockholm.ardendo.se] has joined #bzr | ||
| === jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr | ||
| === mw|out is now known as mw | ||
| === jimk [n=jimk@store-fw.porchlight.ca] has joined #bzr | ||
| === gldnspud [n=gldnspud@72.171.93.139] has joined #bzr | ||
| === bwinton [n=bwinton@mail.phantomfiber.com] has joined #bzr | ||
| === jelmer_ [n=jelmer@a62-251-123-16.adsl.xs4all.nl] has joined #bzr | ||
| === Hattory [i=darkrad@host180-132-dynamic.15-87-r.retail.telecomitalia.it] has left #bzr ["Ex-Chat"] | ||
| === jelmer_ is now known as jelmer | ||
| === hsn_ [n=chatzill@234.114.broadband5.iol.cz] has joined #bzr | ||
| === Lo-lan-do [n=roland@mirenboite.placard.fr.eu.org] has joined #bzr | ||
| Lo-lan-do | jelmer: Following your advice, I tried to upgrade my bzr-svn branch, but I ran into problems. | 04:15 |
| Lo-lan-do | jelmer: http://paste.debian.net/35561 | 04:16 |
| === luks [i=lukas@unaffiliated/luks] has joined #bzr | ||
| === sverrej [n=sverrej@pat-tdc.opera.com] has joined #bzr | ||
| === mthaddon [n=mthaddon@canonical/launchpad/mthaddon] has joined #bzr | ||
| jelmer | Lo-lan-do: how public is that repository, could I download a copy of it from somewhere? | 04:44 |
| Lo-lan-do | The SVN repo cannot be accessed anonymously unfortunately, but I can upload my branch somewhere if that helps. | 04:47 |
| Lo-lan-do | I'll upload a tarball of the branch, with the code and the .bzr dir (but not the .bzr.backup) | 04:48 |
| === sverrej [n=sverrej@pat-tdc.opera.com] has joined #bzr | ||
| === ssh_rdp [n=soroosh@213.207.218.157] has joined #bzr | ||
| Lo-lan-do | Uploading to http://mirobole.placard.fr.eu.org/~roland/tmp/gforge-trunk+bzr.tar.gz -- ETA 15:30 UTC (half an hour, give or take a few minutes) | 05:00 |
| ssh_rdp | Hi, Is the bazaar encrypted branch (SoC2007 Project) usable now? | 05:02 |
| === bigon [i=bigon@imladris.bigon.be] has joined #bzr | ||
| bigon | hi | 05:06 |
| bigon | I have a question, is it possible to add a post-commit hook on a remote branche? | 05:06 |
| === p4tux [n=p4tux@189.169.74.230] has joined #bzr | ||
| === n2diy__ [n=darryl@wlk-barre-208-103-148-124.dynamic-dialup.coretel.net] has joined #bzr | ||
| jelmer | Lo-lan-do: thanks | 05:12 |
| === aklaver [n=aklaver@74-61-141-221.bel.clearwire-dns.net] has joined #bzr | ||
| === badders [n=tom@host86-150-214-130.range86-150.btcentralplus.com] has joined #bzr | ||
| === ssh_rdp [n=soroosh@213.207.218.157] has left #bzr [] | ||
| Lo-lan-do | jelmer: Upload complete. Beware, it's 119 MB. | 05:29 |
| === beuno [n=beuno@201-213-91-212.net.prima.net.ar] has joined #bzr | ||
| === MishaS [n=MishaS@a91-154-120-151.elisa-laajakaista.fi] has joined #bzr | ||
| === cprov is now known as cprov-lunch | ||
| ollie | stupid question maybe, but should applying a v0.9 bundle on win32 using 0.18 work? | 05:45 |
| ollie | doing "bzr merge foo.bundle" results in: "Nothing to do" | 05:46 |
| ollie | searching for "bundle" in the bug tracker didn't result in any hits that looked promising | 05:46 |
| jelmer | ollie: Means all revisions have already been merged | 05:50 |
| ollie | jelmer: I don't see them in the log | 05:54 |
| jelmer | hmm, not sure then | 05:59 |
| jelmer | what does 'bzr missing path-to-bundle' output ? | 06:00 |
| ollie | bzr: ERROR: Not a branch C:/.../file.bundle/ (from "bzr missing file.bundle") | 06:01 |
| === Demitar [n=demitar@c-212-031-190-120.cust.broadway.se] has joined #bzr | ||
| dato | ollie: do you mean a 0.9 or 0.90 bundle? | 06:05 |
| === hsn_ [n=chatzill@234.114.broadband5.iol.cz] has joined #bzr | ||
| hsn_ | ah, bzr still at rc1 | 06:06 |
| ollie | dato: # Bazaar revision bundle v0.9 | 06:08 |
| dato | okay | 06:08 |
| === dhon_ [n=dhon@60-240-97-109.static.tpgi.com.au] has joined #bzr | ||
| === cprov-lunch is now known as cprov | ||
| ubotu | New bug: #135320 in bzr "bzr merge - exceptions.UnicodeDecodeError" [Undecided,New] https://launchpad.net/bugs/135320 | 06:31 |
| === sabdfl [n=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr | ||
| === orospakr [n=orospakr@132.213.238.4] has joined #bzr | ||
| Lo-lan-do | Hey, whacky idea: is there a bzr-baz plugin in the works? :-) | 06:46 |
| === michelp [n=michelp@69-30-72-119.dq1sf.easystreet.com] has joined #bzr | ||
| === zyga [n=zyga@ubuntu/member/zyga] has joined #bzr | ||
| === asak [n=alexis@201-0-39-121.dsl.telesp.net.br] has joined #bzr | ||
| === bigon [i=bigon@imladris.bigon.be] has left #bzr ["Ex-Chat"] | ||
| === renepau [n=rp@e178009255.adsl.alicedsl.de] has joined #bzr | ||
| === dhon [n=dhon@60-240-97-109.static.tpgi.com.au] has joined #bzr | ||
| jelmer | Lo-lan-do: there was a spec for it at some point | 07:56 |
| jelmer | but I don't think there is anybody working on it | 07:57 |
| james_w | abentley: thanks. | 08:07 |
| === EtienneG [n=etienne@ubuntu/member/EtienneG] has joined #bzr | ||
| === beuno [n=beuno@44-111-231-201.fibertel.com.ar] has joined #bzr | ||
| === bac [n=bac@canonical/launchpad/bac] has joined #bzr | ||
| ollie | can anyone suggest a way to test if a bundle is ok? I've got a bundle generated on windows that I've tried to merge on both windows and os x; using 0.18 on windows and bzr.dev on os x; both tell me there's nothing to do | 08:31 |
| === asak_ [n=alexis@201-27-63-69.dsl.telesp.net.br] has joined #bzr | ||
| === asak_ is now known as asak | ||
| james_w | ollie: how did you generate the bundle, i.e. what command and arguments did you use? | 08:40 |
| ollie | james_w: I didn't -- a submitter sent it to me | 08:41 |
| ollie | as it turns out, after a couple hours of head-banging, I noticed my editor say its encoding is x-UTF-16LE-BOM | 08:41 |
| ollie | which seems to be the issue | 08:41 |
| ollie | since saving as utf-8 at least tells me line endings aren't \n | 08:42 |
| ollie | "nothing to do" isn't the greatest error message, though | 08:43 |
| james_w | there is a hidden command called 'bundle-info', try running that and seeing if it reports that there are actually revisions in it. | 08:44 |
| ollie | on os x, using bzr.dev I get told it's an unsupported bundle version | 08:46 |
| ollie | though, when I try to merge it, I get told it won't because of a missing revision (locally) | 08:46 |
| ollie | on windows, using 0.18 (from the installer), it says there's no such command | 08:46 |
| james_w | so you now have a different response on osx? | 08:48 |
| ollie | sorry, I thought I'd said I was using bzr.dev on os x and 0.18 on win32 | 08:48 |
| ollie | trying to indicate it's not working anywhere (for me) | 08:48 |
| james_w | if you read the bundle and find the revision id of the final revision then you can see if it has been installed in your repository by running bzr log -r revid:<revid> in the branch that you are trying to merge in to. | 08:49 |
| james_w | you said "both tell me there's nothing to do", but a missing revision is not "nothing to do" | 08:49 |
| === p4tux [n=p4tux@189.169.75.18] has joined #bzr | ||
| ollie | yes, I did say that -- I've fed 3 bundles into 2 different versions of bzr | 08:50 |
| ollie | 1: x-UTF-16LE-BOM encoding; 2: saved as utf-8; 3: line-endings converted from \r\n -> \n | 08:50 |
| ollie | w/1: "nothing to do"; w/2: wrong line ending; w/3: can't apply because revision is missing | 08:51 |
| ollie | sorry if I sound short -- I'm frustrated and I don't think there's anything that can be done to actually apply this bundle | 08:52 |
| ollie | anyway, thanks for trying to help, james_w | 08:53 |
| james_w | no problem. | 08:55 |
| james_w | if you just want to apply then patch will do so. | 08:55 |
| james_w | 3 sounds like you have been sent on a bundle that is based on a revision that only you user has. | 08:56 |
| james_w | if you look at the parent id of the last revision in the bundle it should be one of your revisions if you want to apply it using bzr. | 08:59 |
| ollie | james_w, yeah, it just took a lot of doing to get that far -- and I was surprised that rather than be told the input was bad, bzr said "nothing to do"; also, it's a bit surprising that "bzr merge bundle" says it can't because of the missing parent, but bundle-info says the bundle version isn't supported | 09:03 |
| ollie | I mean, if merge can figure out it can't apply the bundle -- surely there's some level of support there ;-) | 09:04 |
| james_w | bundle-info was broken for a while because it is hidden command, and only Aaron used it. | 09:04 |
| ollie | ah, ok | 09:04 |
| james_w | I think that you are getting "nothing to do" because the bundle parser skips stuff that it doesn't understand, and you ended up with nothing, and so got "nothing to do" | 09:05 |
| james_w | would you like to file a bug explaining the issues you are having, and telling us how the output could have been more helpful? | 09:05 |
| ollie | skips stuff it doesn't understand is pretty crummy | 09:06 |
| james_w | I guess bundle with no revisions should get and extra message, "nothing to do, empty or corrupt bundle?" | 09:06 |
| bwinton | So, XML is pretty crummy too? :) | 09:06 |
| ollie | sure, i'll file a bug; I mean from a expectation point of view, if it doesn't like it, it should say so -- not just pretend it doesn't exist ;-) | 09:06 |
| james_w | it's just working how patch does, so that you can for instance merge from an email without having to extract the right bits. | 09:06 |
| === EtienneG [n=etienne@ubuntu/member/EtienneG] has joined #bzr | ||
| === p4tux [n=p4tux@189.169.75.18] has joined #bzr | ||
| siretart | hi EtienneG. | 09:32 |
| EtienneG | siretart ! | 09:32 |
| EtienneG | how ya doin' ? | 09:32 |
| siretart | how are you? | 09:32 |
| siretart | :) | 09:32 |
| siretart | thanks fine! | 09:32 |
| EtienneG | I am not so bad | 09:32 |
| siretart | are you working on getting bzr 0.90 to gutsy? | 09:32 |
| siretart | I've notice that it is in debian for some time | 09:33 |
| === matkor [n=matkor@ip83-230-19-175.e-zabrze.pl] has joined #bzr | ||
| === sverrej [n=sverrej@tul-1x-dhcp019.studby.uio.no] has joined #bzr | ||
| === aadis [n=aaditya@122.167.202.29] has joined #bzr | ||
| lifeless | mroning | 10:33 |
| === NfNitLoop [i=codyc@cpe-70-112-28-217.austin.res.rr.com] has joined #bzr | ||
| lifeless | james_w: have you had someone do the release stuff you need done ? | 10:41 |
| === C7 [n=C7@77-56-188-232.dclient.hispeed.ch] has left #bzr ["Verlassend"] | ||
| === sverrej [n=sverrej@tul-1x-dhcp019.studby.uio.no] has joined #bzr | ||
| === sverrej [n=sverrej@tul-1x-dhcp019.studby.uio.no] has joined #bzr | ||
| james_w | morning lifeless. | 10:52 |
| james_w | Aaron merged everything, I'm building the release now, so I will need someone to upload, will you be available? | 10:53 |
| === NfNit|oop [i=codyc@cpe-70-112-28-217.austin.res.rr.com] has joined #bzr | ||
| lifeless | james_w: sure thing | 11:00 |
| james_w | lifeless: http://jameswestby.net/bzr/bzr-0.90.tar.gz | 11:09 |
| james_w | and http://jameswestby.net/bzr/bzr-0.90.tar.gz.sig please | 11:09 |
| lifeless | on it | 11:10 |
| === pekuja [i=pekuja@jolt.modeemi.cs.tut.fi] has left #bzr [] | ||
| lifeless | james_w: done | 11:14 |
| james_w | lifeless: thanks. | 11:14 |
| === ddaa [n=david@canonical/launchpad/ddaa] has joined #bzr | ||
| === bwinton [n=bwinton@mail.phantomfiber.com] has left #bzr [] | ||
| === ..[topic/#bzr:james_w] : The Bazaar Version Control System | http://bazaar-vcs.org/ | Bazaar 0.90 is out - http://bazaar-vcs.org/releases/src/bzr-0.90.tar.gz | ||
| === ..[topic/#bzr:james_w] : The Bazaar Version Control System | http://bazaar-vcs.org/ | Bazaar 0.90 is out - http://bazaar-vcs.org/releases/src/bzr-0.90.tar.gz | Complete the Bazaar User Survey - http://www.surveymonkey.com/s.aspx?sm=L94RvLswhKdktrxiHWiX3g_3d_3d | ||
| === ..[topic/#bzr:james_w] : The Bazaar Version Control System | http://bazaar-vcs.org/ | Bazaar 0.90 is out - http://bazaar-vcs.org/releases/src/bzr-0.90.tar.gz | Please complete the Bazaar User Survey - http://www.surveymonkey.com/s.aspx?sm=L94RvLswhKdktrxiHWiX3g_3d_3d | ||
| james_w | lifeless: there is an item on the checklist to update doc.bazaar-vcs.org. I guess that may be important here with Ian's docs in directories change going in. Are you able to do it or should I ask someone else? | 11:44 |
| lifeless | Uhm, I'm not sure where it is; poolie is most knowledgable | 11:49 |
| james_w | thanks, I'll speak to him. | 11:56 |
| abentley | ollie: When you give merge a URL, it tries to open it as a bundle. If that fails, it tries to open it as a branch. Evidently your bundle was in a branch that you were up-to-date with. | 12:02 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!