lifeless | mwhudson: poolie: order doesn't matter | 00:44 |
---|---|---|
lifeless | mwhudson: it was written with the assumption in mind that you can't use a composite repo until the sides are independently upgraded | 00:44 |
poolie | ok | 00:50 |
Noldorin_ | jelmer: Sorry, lost Internet... Did you make the fix then? | 00:51 |
Riddell | quiet the day | 09:54 |
vila | Riddell: hehe, split storm | 09:59 |
Riddell | qbzr's NEWS.txt file seems to be in UTF-16, anyone know why? | 10:17 |
vila | WAG: edited on windows ? | 10:22 |
jam1 | jelmer: are we still doing the UDD meeting in 10 min? | 10:53 |
jelmer | jam1: I'm not sure to be honest, I haven't heard much about it | 10:53 |
=== jam1 is now known as jam | ||
jelmer | let's see if Barry and poolie will be around | 10:54 |
jelmer | jam: I guess not.. | 11:06 |
poolie | hello all | 13:29 |
Riddell | good evening poolie | 13:33 |
Noldorin | hi jelmer, poolie | 13:35 |
=== mtaylor_ is now known as mtaylor | ||
=== shadeslayer_ is now known as shadeslayer | ||
jelmer | hi poolie, Riddell, Noldorin | 14:18 |
jelmer | maxb: do you know what happened with the ~bzr recipes? | 14:19 |
maxb | I've not looked at them recently | 14:19 |
poolie | i don't | 14:19 |
poolie | hi mgz? | 14:19 |
mgz | hey poolie. | 14:19 |
jelmer | maxb: I'll investigate further. | 14:20 |
Noldorin | jelmer, hi :-) | 14:37 |
Noldorin | jelmer, any updates? | 14:38 |
jelmer | Noldorin: hi | 14:39 |
jelmer | Noldorin: no, I'll update the bug when I have more | 14:39 |
Noldorin | ok cool | 14:39 |
Noldorin | jelmer, at least you know exactly what to rewrite eh? | 14:39 |
Noldorin | jelmer, i noticed you committed a few other fixes already though ;-) | 14:43 |
Noldorin | i will test everything later today i guess, when it's all done | 14:43 |
jelmer | Noldorin: yes, those aren't related to your issue though | 14:47 |
Noldorin | fair enough | 14:48 |
Noldorin | jelmer, okay, i'll just try to wait patiently then :-) thanks | 14:48 |
vila | hmm, interesting, trying to reproduce http://package-import.ubuntu.com/status/musescore.html#2011-09-18%2022:07:55.177188 locally with 2.4.1 fails... | 15:15 |
vila | err, I mean, it seems if 2.4.1 is deployed on jubany that may be enough to fix this import failure | 15:16 |
Noldorin | jelmer, i am trying to push to a branch on github now but no luck...any tips please? | 15:44 |
Noldorin | i try this: | 15:44 |
Noldorin | git://github.com/alexreg/ircdotnet.git,foo-branch | 15:44 |
briandealwis | Noldorin: you have to use ,branch=foo-branch | 15:55 |
briandealwis | Noldorin: and 'git+ssh://git@github.com/XXX,branch=YYY' | 15:55 |
briandealwis | that's what I use at any rate | 15:56 |
Noldorin | hmm | 15:56 |
Noldorin | briandealwis, this suggests otherwise: http://doc.bazaar.canonical.com/developers/colocated-branches.html | 15:56 |
Noldorin | it still says "extra argument to command dpush: branch=foo-branch" | 15:56 |
jelmer | Noldorin: that's a specification, it's not completely implemented yet | 15:57 |
jelmer | Noldorin: see briandealwis' comment on the syntax | 15:57 |
=== beuno is now known as beuno-lunch | ||
Riddell | yay, I have this unicode import error working locally | 16:11 |
vila | Riddell: you mean failing locally ? | 16:11 |
Riddell | it no longer errors here | 16:12 |
Riddell | character encodings can play with your head | 16:12 |
vila | ha, fixed, even better :) | 16:12 |
vila | hehe, indeed | 16:12 |
Riddell | well I wouldn't say fixed, I need to work on it more tomorrow | 16:12 |
=== deryck is now known as deryck[lunch] | ||
Noldorin | jelmer, ok...but that will eventually be the syntax? | 16:16 |
Noldorin | jelmer, even the suggestion of briandealwis does not work yet unfortunately :-( | 16:16 |
Noldorin | PS C:\Users\Alex\Documents\Visual Studio 2010\Projects\IRC.NET\dump\dump2\bzr-branch> bzr dpush git://git@github.com/alexreg/ircdotnet.git,branch=foo-branch | 16:16 |
Noldorin | bzr: ERROR: extra argument to command dpush: branch=foo-branch | 16:16 |
vila | Noldorin: git: != git+ssh: | 16:17 |
Noldorin | oops | 16:17 |
Noldorin | vila, didn't notice that even ;-) | 16:17 |
vila | I don't know what I'm talking about to be honest ;) | 16:18 |
Noldorin | vila, still same error though | 16:18 |
briandealwis | Noldorin: what version of bzr-git are you running? | 16:18 |
Noldorin | briandealwis, latest master. | 16:19 |
Noldorin | 0.6.3dev that is | 16:19 |
briandealwis | hmm, I just pushed something a few minutes ago, but I'm not running the very very latest. | 16:20 |
Noldorin | latest dulwich too of course | 16:21 |
Noldorin | bzr 2.5b1 | 16:21 |
Noldorin | odd | 16:21 |
Noldorin | still the "extra argument" ERROR | 16:22 |
jelmer | Noldorin: what's the exact command you're running? | 16:22 |
Noldorin | jelmer, | 16:25 |
Noldorin | PS C:\Users\Alex\Documents\Visual Studio 2010\Projects\IRC.NET\dump\dump2\bzr-branch> bzr dpush git+ssh://git@github.com/alexreg/ircdotnet.git,branch=foo-branch | 16:25 |
Noldorin | bzr: ERROR: extra argument to command dpush: branch=foo-branch | 16:25 |
Noldorin | bbs | 16:28 |
jelmer | Noldorin: is windows perhaps splitting arguments based on comma? | 16:31 |
vila | Riddell: you meant bug #508258 ? Wow ! | 16:32 |
ubot5 | Launchpad bug 508258 in Ubuntu Distributed Development "Failure to import non-ascii filenames" [Medium,Confirmed] https://launchpad.net/bugs/508258 | 16:32 |
vila | Riddell: which package did you use to reproduce and what was the filename ? | 16:32 |
Riddell | vila: liblingua-de-ascii-perl | 16:36 |
Riddell | filename is t/words_with_umlaut_and_ß.t | 16:36 |
Riddell | but in iso-8859-1 not utf-8 | 16:36 |
vila | :-/ | 16:37 |
fullermd | 7 bits ought to be enough for anybody. | 16:37 |
vila | Riddell: I wonder about what happens on OSX | 16:39 |
Riddell | vila: why? | 16:39 |
vila | because osx sometimes decides to re-normalize for your own good | 16:39 |
vila | one case I encountered when looking at this bug was a file in NFKD form that bzr couldn't handle | 16:41 |
vila | which means at some point someone created a tarball or a commit on OSX | 16:41 |
vila | since we use NFKC, we can't grok the path | 16:41 |
vila | the file was some .pdf in a contrib/doc or something so probably few people realized the issue and linux doesn't care since paths are just bytes | 16:42 |
=== abentley is now known as abentley-lunch | ||
=== beuno-lunch is now known as beuno | ||
=== deryck[lunch] is now known as deryck | ||
=== abentley-lunch is now known as abentley | ||
=== med_out is now known as medberry | ||
=== iBasic is now known as BasicOSX | ||
htorque | hello everyone! i'm probably just blind, but how do you change between revisions? like "git checkout HASH". | 18:43 |
beuno | htorque, bzr revert $revno? | 18:43 |
htorque | hm | 18:45 |
htorque | $ bzr revert 1588 | 18:45 |
htorque | bzr: ERROR: Path(s) are not versioned: 1588 | 18:45 |
beuno | htorque, sorry | 18:46 |
beuno | bzr revert -r $revno | 18:46 |
htorque | beuno: but that's not the same as going back in time - version-info still shows the latest revision. | 18:46 |
beuno | htorque, you want to blow away history? | 18:47 |
htorque | beuno: i'm looking for the commit that caused a regression and therefore like to test a few suspicious revisions. | 18:49 |
fullermd | You probably want update, not revert... | 18:49 |
htorque | fullermd: that's it, thanks! :) | 18:49 |
Noldorin | jelmer, hey, back | 19:14 |
Noldorin | that's possible | 19:14 |
Noldorin | let me check | 19:14 |
Noldorin | jelmer, yes that's the problem :-) | 19:32 |
=== r0bby is now known as robbyoconnor | ||
=== yofel_ is now known as yofel | ||
Noldorin | jelmer, actually still one error when i dpush :-S | 20:04 |
Noldorin | PS C:\Users\Alex\Documents\Visual Studio 2010\Projects\IRC.NET\dump\dump2\bzr-branch> bzr dpush "git+ssh://git@github.com/alexreg/ircdotnet.git,branch=foo-branch" | 20:04 |
Noldorin | bzr: ERROR: refs/heads/master, .have failed to update | 20:04 |
Noldorin | odd | 20:04 |
Noldorin | disappeared the 2nd time... | 20:06 |
Noldorin | jelmer, hello? | 21:18 |
jelmer | Noldorin: hi | 21:20 |
Noldorin | jelmer, have you encountered that odd error before? | 21:21 |
Noldorin | it is strange | 21:23 |
Noldorin | jelmer, well, goodbye i suppose :-P | 21:37 |
jelmer | Noldorin: ? | 21:42 |
jelmer | Noldorin: I haven't seen that error before. Did the repository update? | 21:42 |
Noldorin | jelmer, it did, but it removed all my tags in master :-S | 21:49 |
jelmer | are you running bzr-git trunk? | 21:49 |
Noldorin | yup | 21:49 |
Noldorin | tags always worked fine for me before :-S | 21:49 |
Noldorin | jelmer, i guess i can wait for you to commit the fix too (tonight?) | 21:50 |
Noldorin | and then test again | 21:50 |
jelmer | this one should be easy.. | 21:51 |
Noldorin | okay | 21:51 |
Noldorin | :-) | 21:51 |
Noldorin | jelmer, does that info give you enough to fix it you think? | 21:54 |
jelmer | Noldorin: try again now | 22:21 |
Noldorin | jelmer, sure | 22:42 |
Noldorin | jelmer, pull bzr-git again first? | 22:43 |
Noldorin | i presume | 22:43 |
jelmer | Noldorin: yes | 23:03 |
Noldorin | okay | 23:04 |
Noldorin | jelmer, ooh very nasty error now | 23:05 |
Noldorin | PS C:\Users\Alex\Documents\Visual Studio 2010\Projects\IRC.NET\dump\dump2\bzr-branch> Unable to write to standard output: The pipe is being closed. | 23:05 |
Noldorin | fatal: The remote end hung up unexpectedly | 23:05 |
jelmer | Noldorin: that doesn't say much, unfortunately? | 23:08 |
Noldorin | jelmer, unfortunately no...it's a new error though | 23:08 |
Noldorin | jelmer, just appeared after i pulled your bzr-git update | 23:08 |
jelmer | Noldorin: does it also occur with the previous revision of bzr-git? | 23:09 |
Noldorin | no | 23:09 |
Noldorin | i'll check again | 23:09 |
Noldorin | but don't think so | 23:09 |
Noldorin | jelmer, nope, just in your latest revision | 23:22 |
Noldorin | since i updated | 23:22 |
jelmer | Noldorin: can you check ~/.bzr.log to see what refs it was going to update ? | 23:24 |
Noldorin | jelmer, sorry, my bad. it happens with previous revisions too now | 23:28 |
Noldorin | strange | 23:28 |
Noldorin | 3.695 updating refs. old refs: {'.have': ('16e7f78f1acde7f85b0366546010968edcf0d3e7', None), 'refs/heads/master': ('8fd19796b7ca400d29b4d8d6783ddd8c03b86448', None), 'refs/heads/foo-branch': ('f66e413bceea0acc287defb17aff3e8d3e94d471', None)}, new refs: {'refs/heads/foo4-branch': (None, 'git-v1:f66e413bceea0acc287defb17aff3e8d3e94d471')} | 23:31 |
Noldorin | NoSuchRef: The ref refs/heads/foo4-branch was not found in the repository at git+ssh://git@github.com/alexreg/ircdotnet.git,branch=foo4-branch. | 23:31 |
Noldorin | jelmer, there you go | 23:31 |
jelmer | ah, bzr-git has trouble with refs that it doesn't know the revision of | 23:33 |
Noldorin | jelmer, easy to fix? :-) | 23:35 |
Noldorin | btw, does bzr-git implement rmbranch? | 23:35 |
jelmer | Noldorin: only for local repositories IIRC | 23:43 |
jelmer | feel free to file a bug about it | 23:43 |
Noldorin | jelmer, got it. i guess i can always use git itself for the time being... | 23:44 |
jelmer | Noldorin: actually, remote removal does work but there's a trivial change necessary in dulwich | 23:49 |
Noldorin | jelmer, just submitted the bug. it still throws NotImplementedException | 23:49 |
Noldorin | NotImplementedError* | 23:49 |
bignose | I'm setting up SD, a distributed bug tracking system | 23:50 |
bignose | it wants to store bug database state in the branch | 23:50 |
Noldorin | jelmer, if you briefly explain, i'd be happy to make the change even :-) | 23:50 |
bignose | am I foolish if I tell it to create a new directory ‘$(bzr root)/.bzr/branch/sd/’? | 23:51 |
Noldorin | jelmer, but in any case, still more concerned about this new issue and the old 'r47' one heh... | 23:51 |
bignose | is there a convention for storing state for plug-ins that will be replicated as part of the branch metadata? | 23:52 |
spiv | bignose: you can store the metadata as data, i.e. as files versioned in the tree. e.g. .bzrmeta/my-plugin | 23:53 |
bignose | spiv: is ‘.bzrmeta’ a special name, or just an example? | 23:54 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!