| MTecknology | How do I apply a diff file to a branch? | 00:01 |
|---|---|---|
| bob2 | did the diff come from bzr? | 00:01 |
| MTecknology | ya | 00:02 |
| bob2 | why the diff then? | 00:02 |
| bob2 | instead of using bzr merge or producing a bundle? | 00:02 |
| MTecknology | somebody else generated a few diff files and never pushed a branch to let me do a merge with | 00:03 |
| bob2 | can you ask them to produce a bundle instead? | 00:03 |
| bob2 | if not, just apply with 'patch' | 00:03 |
| MTecknology | how do I apply w/ that command? | 00:04 |
| MTecknology | I know there's multiple files changes with each patch file | 00:04 |
| Peng_ | The person should really generate bundles. With bundles, you'd then use "bzr merge path/to/whatever.bundle" | 00:05 |
| MTecknology | I already asked them to | 00:05 |
| MTecknology | they won't | 00:05 |
| MTecknology | nvm... I figured it out | 00:06 |
| jseabold | bob2: I have pushed from my home computer which was revision 1726, then I pushed from work which was 1727, both show up on launchpad, but when I try bzr up it says at newest revision 1726 | 00:15 |
| jseabold | bob2: maybe I should just try to get the branch again from launchpad? | 00:18 |
| GaryvdM | jelmer:http://en.wikipedia.org/wiki/AFB_Hoedspruit | 00:44 |
| jelmer | 'evening Bob | 01:02 |
| lifeless | hi jelmer | 01:07 |
| jelmer | Hi lifeless | 01:08 |
| jelmer | How are things? | 01:08 |
| lifeless | as well as can be expected | 01:08 |
| jseabold | bob2: sorry to bother, but I just had another look at it, and I think it's because when I started the other working directory at work I used "bzr branch" then pushed back to the original place rather than "bzr checkout" | 01:20 |
| jseabold | does that sound possible? | 01:20 |
| evn | Bazaar (bzr) 1.16dev | 01:25 |
| evn | how do i start git-serve now? | 01:25 |
| bob2 | jseabold: checkout and branch do mostly the same thing | 01:26 |
| jseabold | bob2: Hmm, I just tried both and the branch command said "Branched revision(s) 1727" and checkout didn't return any message, so I thought maybe that was the difference. | 01:30 |
| evn | jelmer: ^ | 01:33 |
| jelmer | evn, bzr serve --git | 01:33 |
| evn | it appears to work | 01:33 |
| evn | should it output anything? | 01:33 |
| jelmer | evn, no, not at the moment | 01:34 |
| evn | fatal: http://localhost/info/refs not found: did you run git update-server-info on the server? | 01:34 |
| evn | is it on some specific port? | 01:35 |
| bob2 | jseabold: sorry, not sure where you ran these things etc | 01:35 |
| evn | oh, something happened | 01:36 |
| evn | http://pastie.org/492184 | 01:37 |
| jseabold | bob2: Right, oh well. Thanks for the help, but I've got to run. I'm sure I'll be back if I keep running into this problem... | 01:37 |
| jelmer | evn, not sure what's happening there. Any chance you can file a bug? | 01:40 |
| jelmer | I don't have time to look into it now unfortunately | 01:40 |
| evn | sure...where | 01:40 |
| jelmer | launchpad.net/bzr-git | 01:40 |
| evn | ok | 01:41 |
| jelmer | I don't have time to look into it atm, time for sleep | 01:41 |
| jelmer | g'night | 01:41 |
| evn | thanks | 01:41 |
| evn | https://bugs.launchpad.net/bzr-git/+bug/381143 | 01:45 |
| ubottu | Ubuntu bug 381143 in bzr-git "bzr serve --git creates an absolute URL with a transport on OS X and then complains about it" [Undecided,New] | 01:45 |
| evn | hello there, bot | 01:48 |
| Peng_ | ubottu isn't a bot, just a really fast typer. :) | 01:57 |
| ubottu | Error: I am only a bot, please don't think I'm intelligent :) | 01:57 |
| Peng_ | ubottu: Not helping! | 01:57 |
| ubottu | Sorry, I don't know anything about Not helping! | 01:57 |
| Peng_ | :( | 01:57 |
| GarveyPatrickD | ubottu: Help | 02:05 |
| ubottu | Hi! I'm #bzr's favorite infobot, you can search my brain yourself at http://ubottu.com/factoids.cgi - Usage info: http://wiki.ubuntu.com/UbuntuBots | 02:05 |
| GarveyPatrickD | What does it respond to? | 02:07 |
| igc | morning | 02:22 |
| Peng_ | G'morning! | 02:25 |
| === nadavoid_away is now known as nadavoid | ||
| nadavoid | I've used bzr push sftp://[stuff] and connected and apparantly succeeded. But it didn't do what I thought it would. It crated a repository (.bzr directory) on the sftp server, but it didn't publish an actual files there. What do I need to do to publish the actual files that I'm working with? | 04:33 |
| nadavoid | In other words, I currently end up with *only* the .bzr directory being created on the server. | 04:34 |
| bob2 | 'bzr checkout' | 04:34 |
| bob2 | then the 'update after push' plugin | 04:34 |
| bob2 | ( https://launchpad.net/bzr-push-and-update/ ) | 04:35 |
| nadavoid | bob2: that looks perfect. thank you very much! | 04:35 |
| nadavoid | bob2: should I delete the .bzr directory I just created, before I try what you suggested? | 04:36 |
| bob2 | no | 04:49 |
| mib_y3onohsi | Having trouble setting ACLs for shared repositories | 05:51 |
| mib_y3onohsi | Anyone with such knowledge? | 05:51 |
| nadavoid | I've done 'bzr push sftp://[stuff]' --- now I can't get 'bzr checkout' to work. I've tried several variations of the command. | 06:33 |
| nadavoid | I want 'bzr checkout' to put the actual files on the server. | 06:34 |
| nadavoid | 'bzr checkout alone doesn't do it. | 06:34 |
| nadavoid | I've also tried 'bzr checkout ./ sftp://username@server/~/path/to/directory' but that gives me this error: "ERROR: File exists: 'path/to/directory/.bzr': Failure: unable to mkdir" | 06:36 |
| nadavoid | I tried that exact same command after deleting .bzr directory on the server, but that failed too. (I forget the error message on that one.) | 06:37 |
| bob2 | don't do any of that, aside from the first 'push' | 06:39 |
| bob2 | https://launchpad.net/bzr-push-and-update/ | 06:39 |
| nadavoid | oh. so I just install the plugin, then do 'bzr push' again? | 06:40 |
| bob2 | don't know | 06:40 |
| lifeless | nadavoid: you'll need to install the plugin, ssh to the server, run 'bzr checkout .' in the directory in question, and then when you push it should just work | 06:40 |
| nadavoid | lifeless: bzr isn't installed on the server. Would that prevent me from doing what you say? | 06:41 |
| lifeless | yes | 06:41 |
| nadavoid | bummer. | 06:41 |
| lifeless | nadavoid: if you just want a copy of the code on the server, get the upload plugin instead | 06:42 |
| lifeless | it it designed for web publishing and such | 06:42 |
| nadavoid | lifeless: that would work if I'm wanting to regularly make updates? | 06:43 |
| nadavoid | I want to have a local copy of php code, and push it out to live sites occasionally. | 06:44 |
| lifeless | nadavoid: thats what bzr-upload is designed for | 06:56 |
| nadavoid | ok, great. now I just have to figure out how to get it installed properly. | 06:56 |
| ronny | anyone aware of any invocation rites to get jelmer here ? | 07:19 |
| lifeless | he should be on soon, he is in spain at a sprint at the moment | 07:20 |
| ronny | lifeless: ah, i see, im tinkerning with adding some higher level api's to dulwich, want to discuss before starting implementing | 07:52 |
| BasicOSX | poolie: ping? I | 08:53 |
| BasicOSX | I'm not sure I understand your response on the ML. following release doc I did 'make dist' and it succeeded. | 08:54 |
| === jblount_ is now known as jblount | ||
| beuno | Peng_, ping | 09:03 |
| ronny | jelmer: are there any plans to make the dulwich apis more nice for walking trees/commit graphs | 09:08 |
| ronny | currently many things about objects give me object id's, when another objects might have been convient | 09:09 |
| poolie | BasicOSX: hello | 09:14 |
| poolie | i'll re-read it | 09:14 |
| poolie | igc: hello, if you're here | 09:14 |
| poolie | hello lifeless | 09:14 |
| poolie | lifeless: is there a "scroll to bottom" key in irssi? | 09:15 |
| jelmer | ronny, Hi | 09:16 |
| jelmer | ronny, I'm not sure what the best approach is there | 09:16 |
| jelmer | ronny, The Bazaar graph utility functions are generic enough that they're usable for git as well, but I'm not sure if I want to maintain a copy of them in Git | 09:17 |
| jelmer | igc, ping | 09:17 |
| ronny | jelmer: i can probably deal with the graph walking fine, but walking the trees could be a bit more convient | 09:18 |
| poolie | BasicOSX: answered; hth | 09:18 |
| jelmer | ronny: What sort of functions are you looking for exactly? Walking the contents of the full tree? | 09:18 |
| jelmer | ronny, Just iterating over all entries in a trees works fine for me, there's also a function that can lookup a path | 09:19 |
| ronny | jelmer: im mostly looking for apis that give me objects instead of object-id's | 09:20 |
| jelmer | ronny: If you have an object id it's a matter of repo[object-id] to get at the object | 09:20 |
| ronny | jelmer: im not exactly sure on it yet, i'll implement a prototype in anyvc | 09:21 |
| jelmer | ronny: Retrieving the object immediately from tree is going to be slow if you don't actually need the object | 09:21 |
| ronny | jelmer: yes, but that step of indirection feels inconvient, i have to take care of the repo, the object, the id's , lost of things to track i dont directly care about | 09:21 |
| jelmer | ronny: dulwich can provide a function that returns an iterator over tuples of data in the tree, but you have no ability to skip any data in the tree | 09:22 |
| poolie | igc: great performance patches | 09:22 |
| ronny | jelmer: i'll build what i think that could work nice and will let you review that for suckage points | 09:23 |
| jelmer | ronny, would that help? | 09:23 |
| ronny | jelmer: im not yet sure on my exact neesds, anyvc's history stuff is still rather small | 09:24 |
| jelmer | mwhudson: is the vlc import still failing? | 09:32 |
| mwhudson | jelmer: i don't know, let's look | 09:33 |
| mwhudson | jelmer: yes: https://code.edge.launchpad.net/~vcs-imports/vlc/master | 09:33 |
| wam | Hi, I use bzr 1.15 and want to use something like svn externals. I read all about nested trees and I think that's what I want. But it doesn't work. I always end up with a error message "ERROR: Cannot join myproject. Trees have the same root id". | 09:36 |
| wam | I'm developing zope and have a directory "src" where my projects are. They're all their own repositories. Now I want to have a "root" repositry that fetches them all plus some config files for the whole project when I co it. | 09:37 |
| wam | Am I misunderstanding the "nested trees"? | 09:37 |
| mwhudson | wam: you are aware nested trees are very alpha-ish right? | 09:38 |
| mwhudson | wam: but that sounds like the trees you are joining are not in a format that supports such | 09:38 |
| wam | mwhudson: should they all be rich-root? | 09:38 |
| wam | mwhudson: I didn't know that they're alpha ;) But I really need that feature... | 09:39 |
| abentley | beuno: Would you like to work on some more user stories? | 09:39 |
| mwhudson | wam: oh look! abentley is here | 09:39 |
| wam | ;) | 09:39 |
| wam | abentley: could you guide me to a working nested tree setup? I already have a directory with several repositories and would like to join them all to a global repository for the whole project. | 09:42 |
| === cody-somerville_ is now known as cody-somerville | ||
| mwhudson | wam: maybe you could use scmproj (google) for now? | 09:46 |
| wam | mwhudson: didn't know that. /me looks | 09:47 |
| abentley | wam: nested-by-reference is not in a usable state. If you want to combine your trees into a single tree, you can use the merge-into plugin. | 09:52 |
| wam | abentley: thanks, I'll have a look | 09:52 |
| abentley | wam: If you want the trees to remain separate, scmproj is probably the best choice. | 09:53 |
| wam | abentley: that was the intention. So scmproj will match. | 09:53 |
| igc | ping poolie, jelmer | 11:11 |
| igc | hi guys - was at dinner previously | 11:11 |
| igc | I've got 10-20 minutes before I need to get the kids into bed if you need to chat about anything | 11:12 |
| pygi | igc: they're in a session I think | 11:22 |
| igc | thanks pygi | 11:22 |
| * igc bbl | 11:32 | |
| nedosa | question: i've made more than a few changes in my own branch, which I now want to merge back to the trunk, but re-shuffle the commits into more logical segments | 11:43 |
| nedosa | so i've tried to generate a diff from the common ancestor between my branch and the trunk, which i then want to apply to the trunk and then proceed like that | 11:44 |
| bob2 | bzr-rebase | 11:44 |
| bob2 | but think about whether it really matters to you or not | 11:44 |
| nedosa | oh i see | 11:45 |
| nedosa | i ran into problems with creation of new directories and moving files, it doesn't seem to be cleanly supported by the diff,patch combo | 11:46 |
| lifeless | poolie: dunno, never looked for it | 12:00 |
| jelmer | LarstiQ, ping | 13:40 |
| LarstiQ | jelmer: pong | 13:42 |
| jelmer | LarstiQ, are you still able to reproduce bug 336749 with newer versions of bzr/bzr-svn, with fresh clones? | 13:43 |
| ubottu | Launchpad bug 336749 in bzr-svn "reconcile raises a KeyError on a fresh branch" [Undecided,Invalid] https://launchpad.net/bugs/336749 | 13:43 |
| LarstiQ | jelmer: how new? | 13:44 |
| jelmer | LarstiQ, like, 0.6.1 | 13:44 |
| LarstiQ | jelmer: should I wipe the cache? | 13:44 |
| jelmer | LarstiQ, yeah | 13:44 |
| * LarstiQ reruns the sequnce | 13:44 | |
| jelmer | LarstiQ, you also might want to install python-tdb at the same time (should give a faster and smaller cache) | 13:44 |
| LarstiQ | jelmer: I'm a bit leary of tdb yet | 13:44 |
| LarstiQ | it's still a very fresh change, see things like bug 381270 | 13:45 |
| ubottu | Launchpad bug 381270 in bzr-svn "Debian packaging doesn't declare minium python-tdb version" [Undecided,New] https://launchpad.net/bugs/381270 | 13:45 |
| jelmer | Ah, I should be using tdb.Tdb probably | 13:46 |
| LarstiQ | jelmer: I started packaging 0.6.1 as you see, I hope that's ok | 13:47 |
| jelmer | LarstiQ, more than ok :-) Thanks for doing that | 13:47 |
| LarstiQ | jelmer: feel free to prewarn/prod me on irc around a release so the debs can be done even faster ;) | 13:47 |
| jelmer | LarstiQ, will do :-) | 13:47 |
| LarstiQ | hmm, the bzr check https:// trips an assertion | 13:48 |
| LarstiQ | jelmer: bzr branch https://../spitfire; cd spitfire; bzr reconcile -> similar backtrace, same KeyError | 13:49 |
| jelmer | LarstiQ, but what about branch? | 13:49 |
| jelmer | LarstiQ, That's the main one we looked at tbh | 13:50 |
| LarstiQ | hmm, I can't find the tdb cache to remove | 13:51 |
| jelmer | Should be somewhere in ~/.cache/bazaar/svn if you have xdg | 13:52 |
| LarstiQ | check | 13:52 |
| * LarstiQ removes | 13:52 | |
| LarstiQ | jelmer: the second branch completes | 13:53 |
| * LarstiQ tries log | 13:53 | |
| LarstiQ | seems to work too | 13:53 |
| jelmer | LarstiQ, Ok, so reconcile is the main thing that's remaining? | 13:53 |
| LarstiQ | jelmer: so far, yes | 13:54 |
| === mrevell is now known as mrevell-lunch | ||
| === Kissaki^0ff is now known as Kissaki | ||
| LarstiQ | beuno: could you test the hardy bzr-svn 0.6.1 package in the (main and beta have the same) ppa? | 14:39 |
| beuno | LarstiQ, will do in ah hour or two | 14:43 |
| LarstiQ | cool | 14:43 |
| === mrevell-lunch is now known as mrevell | ||
| visik7 | hi | 14:53 |
| visik7 | I've a repository I want to give access to only a subdir is it possible ' | 14:54 |
| visik7 | ? | 14:54 |
| LarstiQ | visik7: if with repository you mean branch, no. | 14:57 |
| visik7 | yes sorry a branch | 14:57 |
| visik7 | neither with views ? | 14:57 |
| LarstiQ | I very much doubt that. | 14:57 |
| LarstiQ | visik7: you could split it into different branches though. | 14:57 |
| visik7 | LarstiQ: how ? | 15:24 |
| awilkins | lifeless: Ping? | 15:39 |
| danigm | Hi all | 15:40 |
| danigm | It's possible to define an alias similar to launchad plugin "lp"? | 15:41 |
| * awilkins thinks the answer is in your question | 15:42 | |
| GaryvdM | danigm: such as in another plugin, yes | 15:43 |
| danigm | GaryvdM: but it's needed to add another plugin? is not possible to do it changing a configuration file? | 15:44 |
| GaryvdM | No | 15:45 |
| GaryvdM | You may be interested in the bookmark plugin? | 15:45 |
| danigm | GaryvdM: ok, I will look it | 15:45 |
| === Noya_ is now known as Noya | ||
| fullermd | Damnit. So now all my preferences and subscriptions and login and everything on the wiki is gone off to la-la land? | 16:13 |
| emmajane | fullermd, because of the LP signon? | 16:16 |
| fullermd | Yeah. | 16:16 |
| emmajane | I remember I was still subscribed to /a/ page, but I don't remember if I've been getting updates. | 16:17 |
| SamB | hmm ? | 16:17 |
| emmajane | huh. maybe not though (according to my UserPreferences page) | 16:17 |
| poolie | hello emmajane | 16:18 |
| emmajane | poolie, hey :) | 16:18 |
| SamB | they should have had it email everyone a thingy to migrate their preferences to their LP account ... | 16:18 |
| emmajane | fullermd, Yeah, I lied. I have no subscriptions either. | 16:18 |
| emmajane | SamB, I have no recollection of receiving such an email... | 16:19 |
| SamB | I said "maybe they should have" | 16:19 |
| SamB | indicating that they didn't | 16:19 |
| fullermd | Better would be to just let me migrate the account... | 16:19 |
| emmajane | SamB, ahhh. I missed the part where you didn't type "maybe" ;) | 16:19 |
| SamB | oh, oops | 16:19 |
| SamB | fullermd: that's what I mean -- should have emailed you a link to do just that | 16:20 |
| SamB | or a blob of text or something | 16:20 |
| emmajane | poolie, did you stick around for UDS? | 16:20 |
| emmajane | SamB, that's *way* too logical to give users choice. :) | 16:21 |
| SamB | emmajane: what, you would prefer it try to migrate to a launchpad account with the same email and, if none existed, just drop everything ? | 16:22 |
| poolie | emmacjane, yes, i did | 16:23 |
| SamB | I mean, you might have used say naesten+bzrwiki@gmail.com or something -- presumably you wouldn't have that listed in your launchpad account ;-) | 16:23 |
| emmajane | SamB, I'm just agreeing with fullermd that it's rude to lose user data/preferences. :) | 16:24 |
| emmajane | poolie, excellent. :) | 16:26 |
| SamB | now that you've alerted me to this issue, I have resubscribed to http://bazaar-vcs.org/GitStyleBranches | 16:26 |
| SamB | which is probably the only thing I was subscribed to | 16:27 |
| SamB | speaking of which, does anyone have any criticisms for that page? | 16:28 |
| ronny | jelmer: you got some code somewhere that helps viewing svn history as reasonable graph? | 16:30 |
| jelmer | ronny, How do you mean? | 16:31 |
| jelmer | ronny, subversion is mostly left hand side revisions and cherrypicks | 16:31 |
| ronny | jelmer: i have no idea what you mean by that | 16:32 |
| emmajane | SamB, I don't understand what it's about.... | 16:32 |
| SamB | ronny: I'm afraid bzr-svn doesn't use svn mergeinfo as well as it could :-( | 16:32 |
| jelmer | ronny, revisions in subversion don't have more than one parent | 16:32 |
| jelmer | SamB, ? | 16:32 |
| ronny | bascially i just want to try to make the stuff in branches/tags/trunk look as dag-ish as possible | 16:32 |
| SamB | jelmer: well, you COULD try to check if all of the revisions since a branch point have been merged ... | 16:33 |
| jelmer | SamB, that'll help only a few users at a performance cost | 16:33 |
| SamB | jelmer: and probably just make them grumpier ;-) | 16:34 |
| SamB | yes | 16:34 |
| jelmer | SamB, supporting mergeinfo that way is pointless until bzr itself supports proper cherrypicking tracking | 16:34 |
| SamB | but it sounds like it's what ronny was hoping for | 16:34 |
| jelmer | SamB, no, it's unrelated - we weren't talking about bzr-svn | 16:34 |
| SamB | well, I mean, ronny seems to be looking for code that does basically that | 16:35 |
| jelmer | SamB, no, because that's unrelated to a dag | 16:35 |
| SamB | jelmer: I don't see how it's unrelated! | 16:35 |
| ronny | hmm, svn history is not exactly coercable into a dag | 16:35 |
| jelmer | ronny, afaik you're looking for svn repository layout code right? | 16:36 |
| ronny | jelmer: mostly | 16:36 |
| SamB | ronny: yeah, looking at git-svn's graphs in gitk is always so depressing :-( | 16:36 |
| ronny | jelmer: i wantto have a remotely reasonable log | 16:36 |
| jelmer | ronny, there's nothing like that in subvertpy | 16:37 |
| ronny | jelmer: i know that already, just wondered if you had something about that somewhere else | 16:38 |
| ronny | hmm, time to play with remoteaccess | 16:38 |
| jelmer | ronny, bzr-svn does that sort of analysis | 16:38 |
| ronny | i need to get at least the commit message of the "head" revision | 16:39 |
| emmajane | SamB, I took a look at your wiki page. It needs more of an introduction. I don't understand what it's describing at this point. | 16:39 |
| jelmer | ronny: So, RemoteAccess.get_log will get you linear history information just like "svn log" | 16:39 |
| SamB | emmajane: yeah. I seem to have thought so too ... but couldn't figure out what to say | 16:39 |
| SamB | at least, judging by the thing I have in brackets at the top | 16:40 |
| emmajane | SamB, adding a useful heading to the very-very top would be a good start. :) | 16:40 |
| emmajane | SamB, try just telling me here what it's about and then cheat and copy and paste it into the doc. | 16:40 |
| ronny | jelmer: are there any examples to get the last revision that commited to trunk? | 16:41 |
| SamB | well, it's supposed to be about how to keep several branches around but use them all with the same working directory | 16:41 |
| emmajane | SamB, cool! | 16:41 |
| jelmer | ronny, see examples/ra_log.py | 16:41 |
| SamB | sort of like when you use branches with git | 16:41 |
| emmajane | SamB, how about: Creating a working directory | 16:42 |
| emmajane | and then: This page explains how to set up a working directory that contains multiple branches. This will be familiar to those who've used Git in the past and are migrating to Bazaar. | 16:43 |
| SamB | emmajane: well, it can't actually *contain* the branches | 16:43 |
| SamB | at least, I don't know how it can | 16:44 |
| emmajane | (although who've to should be expanded as it's harder for ESL readers) | 16:44 |
| ronny | jelmer: doesnt looke exactly what i want, im goign to try figuring | 16:44 |
| ronny | jelmer: in case of doubt, i have to take the latest from_rev inside the first callback and run a second one? | 16:44 |
| jelmer | ronny, that's exactly what you were mentioning except that it iterates all revisions from 0 to the latest rather than the other way around | 16:45 |
| jelmer | and you need to pass limit=1 if you need just one | 16:45 |
| emmajane | SamB, no? | 16:45 |
| emmajane | SamB, I thought that was the whole point: shared repo for multiple branches? | 16:45 |
| SamB | emmajane: yeah | 16:46 |
| SamB | but unlike git, the branches aren't inside the working directory | 16:46 |
| SamB | not without ColocatedBranches, anyway | 16:46 |
| emmajane | SamB, great, so go ahead and adjust what I've typed to make it right for your doc. | 16:46 |
| SamB | emmajane: okay, I didn't change much | 16:48 |
| SamB | except I basically rewrote the heading | 16:48 |
| emmajane | great. | 16:49 |
| emmajane | SamB, It would also be most excellent to get rid of the (instructions in brackets). They're sort of confusing as written. | 16:49 |
| jelmer | Are you talking about the GitStyleBranches spec? That should probably be folded into the ColocatedBranches one | 16:49 |
| emmajane | specifically: [Again, the cd commands are kinda ridiculous here -- maybe I should use another way of indicating where each step is to be done?] | 16:49 |
| emmajane | jelmer, http://bazaar-vcs.org/GitStyleBranches | 16:50 |
| emmajane | that's the page I'm looking at. | 16:50 |
| SamB | jelmer: it's not a spec! | 16:50 |
| SamB | it's a tutorial thingy | 16:50 |
| jelmer | ah, sorry | 16:50 |
| jelmer | never mind me then | 16:50 |
| emmajane | jelmer, :) | 16:50 |
| emmajane | jelmer, I always mind you! :) | 16:50 |
| SamB | I like to live only very slightly in the future ;-) | 16:50 |
| emmajane | SamB, I often live in the past. :) | 16:51 |
| SamB | (which is to say, in bzr.dev rather than the release) | 16:51 |
| SamB | and sometimes I don't upgrade and end up in the past | 16:51 |
| emmajane | SamB, what does the heading, "What They Said" mean? | 16:52 |
| emmajane | SamB, do you mean, "Background information" ? | 16:52 |
| SamB | emmajane: hmm, yeah, that was the next thing I wanted to change | 16:52 |
| === thekorn_ is now known as thekorn | ||
| SamB | hmm, yeah, that sounds like a much better heading there | 16:53 |
| emmajane | SamB, for the actual step by step instructions I like to have detailed information on what I'm about to do and then what I type at the command line. | 17:01 |
| ronny | jelmer: btw, ever experimented if greenlets turn may turn the svn log into a generator? | 17:01 |
| jelmer | ronny: it seems a bit heavyweight to depend on greenlets for that sort of thing, it would mean subvertpy would have to depend on them | 17:02 |
| ronny | jelmer: im trying to figure hout how to wrap it, so it will fallback to a thread | 17:02 |
| emmajane | SamB, and where possible I like to expand commands (e.g. the shortcut on mv. Not everyone knows about curly braces...I've been using *nix for over six years and just found out about it last year.) | 17:03 |
| jelmer | ronny: bzr-svn also has some functionality that can do that, using a simple helper thread | 17:03 |
| emmajane | SamB, You can probably also get rid of the cd $FOO and cd .. commands. Just explain to people in words which directory they need to be in before issuing the relevant command. | 17:04 |
| emmajane | I've made it in life! lifeless asked me to be his facebook friend. :) | 17:08 |
| igc | night all | 17:43 |
| Guest | Hello, is it possible to make bzr ignore symlinks? | 18:17 |
| === Guest is now known as Guest2022 | ||
| Guest2022 | I mean, how do I create a general rule into .bzrignore to make it ignore all symlinks | 18:18 |
| Guest2022 | no one? | 18:41 |
| fullermd | I'm pretty sure there isn't one. .bzrignore just takes paths. | 18:42 |
| Guest2022 | thanks | 18:45 |
| mib_dzx78e79 | Anyone with knowledge of ACLs? | 19:07 |
| === awilcox_ is now known as awilcox | ||
| mib_9ju1c2mf | Can anyone assist with a permission issue? | 20:08 |
| === abentley1 is now known as abentley | ||
| === nevans1 is now known as nevans | ||
| === mtaylor_ is now known as mtaylor | ||
| lifeless | awilkins: pong | 21:19 |
| mib_l3vtwtue | What is the best way to set up a shared repository among several users on a single machine? | 21:50 |
| === Kissaki is now known as Kissaki^0ff | ||
| emmajane | Created a standalone tree (format: pack-0.92) <--- that's a nice touch. | 22:59 |
| emmajane | takes some of the magic out of init. | 22:59 |
| Peng_ | beuno: pong, ish | 23:09 |
| === nevans1 is now known as nevans | ||
| === AnMaster is now known as AnMaster_ | ||
| === AnMaster_ is now known as AnMaster | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!