| CcxCZ | vila: it tells me how to configure it, not how to invoke it | 08:49 |
|---|---|---|
| CcxCZ | none of the bzr commands I've looked at take a mergetool as an argument | 08:49 |
| vila | CcxCZ: let see, if it's *configured* that may be because you don't have to specify it as an argument. Could it be that merge*tool* implies that it's invoked by... merge ? Just guessing after looking at the *first* link in the page you linked, the video | 09:03 |
| vila | CcxCZ: not to mention the first text in that page: "Splice is a Vim plugin for resolving conflicts during three-way merges. " | 09:03 |
| vila | *during* merges | 09:03 |
| CcxCZ | well, what's the point of having a named list of mergetools, beside the default one then? | 09:04 |
| CcxCZ | vila: so there is no way to select a mergetool except changing the default in the config file? that was my original question. (vimeo is strangely broken for me atm) | 09:12 |
| vila | CcxCZ: evry bzr option is available from the command line with -O, so bzr merge -Obzr.default_mergetool=whatever if you want to override your config file | 09:15 |
| CcxCZ | ah, thanks :) | 09:16 |
| yooozy | I need help, anyone? | 12:01 |
| yooozy | bgardner, hello | 12:02 |
| bgardner | yooozy: Morning | 12:03 |
| yooozy | bgardner, ) | 12:03 |
| bgardner | yooozy: Go ahead and ask, but I'm not a bzr expert so be prepared for puzzled looks. | 12:03 |
| yooozy | bgardner, I made a local branch to my live site folder so that I can edit and upload files and commit changes then push, the problem is that the local branch is not pulling data project | 12:06 |
| yooozy | *project data | 12:06 |
| bgardner | yooozy: You mean there the branch isn't complete? Not sure how you meant that it isn't pulling. | 12:07 |
| yooozy | bgardner, let me show you what I did, one moment | 12:08 |
| fullermd | "project data" sounds like something that wouldn't be under version control, so it would be unsurprising that a VCS wouldn't transfer it... | 12:11 |
| yooozy | bgardner, "aziz@aziz-HP$ bzr init ftp://user@example.com/public_html/forums " then "aziz@aziz-HP$ bzr init ftp://user@example.com/public_html/forumsaziz@aziz-HP$ bzr branch ftp://user@example.com/public_html/forums" | 12:12 |
| fullermd | OK, that is definitely not going to do anything too helpful :) | 12:13 |
| yooozy | fullermd, you mean than bzr should be installed in server? | 12:13 |
| fullermd | (also, FTP is the devil) | 12:13 |
| bgardner | fullermd: +1 | 12:13 |
| fullermd | If you're going to want to have bzr actually do stuff with the files on the server, yes (and FTP access wouldn't be sufficient for that; you'd need ssh and shell and such) | 12:14 |
| fullermd | What you did there was just create a new empty branch at that location, then made a local copy of the empty branch. Which is technically _valid_, of course, but probably not too efficacious :) | 12:14 |
| fullermd | On the first hand, you presumably want a branch with all those files in it, which would mean you'd either need a real shell on the server where you could bzr add ; bzr ci the files, or to manually copy them all down locally to do the same there. | 12:15 |
| fullermd | And on the second, if you're wanting to use bzr to copy later changes up to the server, you'd also need a real shell (well, technically not quite absolutely, but near enough for now) and bzr installed to do it; push over a remote protocol isn't going to touch the remote files, just the internal history. | 12:16 |
| yooozy | fullermd, I used bzr upload plugin it worked | 12:17 |
| fullermd | (in the abstract, a VCS is neither a file transfer app, nor a site deployment app. A lot of people try to use it as such, with sometimes decent success, and sometimes utter failure; usually somewhere in between) | 12:17 |
| fullermd | 'k, that's another different thing. It doesn't (AFAIK; never used it) maintain any actual bzr-history-stuff like a branch on the server, it's just sorta a conceptual wrapper around FTP'ing the individual working files up. | 12:17 |
| yooozy | fullermd, suppose I have shell access, what is the scheme to achieve the same? | 12:19 |
| fullermd | Well, you could init / add / ci the files; then you'd have a branch you could branch down locally and have the stuff to work with. | 12:21 |
| fullermd | (though it's likely a little more involved than that, in that there are probably files there you wouldn't want in version control, blah blah. But in concept...) | 12:21 |
| fullermd | Then you could make local changes, use push to update them into the remote side branch, and login to the server to do a local update to bring them out into that WT. | 12:22 |
| fullermd | Or there's a push-and-update plugin, which basically just automates "ssh $server ; bzr up" | 12:22 |
| yooozy | got it | 12:25 |
| yooozy | fullermd, thank you so much | 12:25 |
| fullermd | If you wanted to use 'upload', it would be more like copy files down ; init/add/etc all your branch stuff locally ; upload when appropriate, and not have a branch on the server side at all. | 12:28 |
| fullermd | (or possibly push it somewhere else on the server, to have as backup etc) | 12:28 |
| fullermd | Or possibly not; somebody else can probably tell you more about upload. I just know what I've seen from other people talking about it. | 12:28 |
| yooozy | that's what I'm going to do for the moment but I will use launchpad as a backup | 12:29 |
| fullermd | That could work too, assuming you're OK with it being public. Or you have the semi-mythical private commercial launchpad account thingy. | 12:30 |
| yooozy | but why not having a branch at server? | 12:31 |
| fullermd | Since upload doesn't interact with a branch at the upload location, I'd recommend not also pushing a branch to the same place, just to avoid possible confusion. | 12:32 |
| fullermd | Either having the files "owned" by a branch there and managed via local 'update' etc, or owned by upload with no branch at the same place. | 12:33 |
| fullermd | Not that I think it would _break_ anything in itself, just minimizing possible confusion or human-caused conflicts down the line. | 12:34 |
| yooozy | I guess it's simpler than I thought | 12:34 |
| yooozy | so basically I just download files manullay, bzr them... and upload...but I have to ignore some files isn't it? | 12:36 |
| fullermd | I wouldn't think upload would mess with files it doesn't know anything about one way or the other, so just bringing down and bzr'ing the files you care about managing should leave the other files on the server untouched. | 12:42 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!