| dOxxx | when you make a new commit, you're adding a connection from the current revision to the new commit | 00:00 |
|---|---|---|
| dOxxx | and then the branch's tip pointer is updated to point at the new commit | 00:00 |
| dOxxx | note that the revision checked out in the working tree is not necessarily the same as the branch tip | 00:01 |
| gwal | but with bzr update I jump to the tip? | 00:01 |
| dOxxx | yes | 00:01 |
| dOxxx | that updates the working tree to the same state as the tip revision | 00:01 |
| dOxxx | conversely, bzr update -rN will update the working tree to the state at revision N | 00:02 |
| gwal | so my tip revision is revision 5 which is in the repository at the remote location indicated with sftp:// | 00:02 |
| dOxxx | and in the case of the push you did earlier, it add new revisions but couldn't do the equivalent of `bzr update` | 00:02 |
| dOxxx | yes | 00:02 |
| gwal | I use the remote location exclusively as a repository ... and I just did a bzr pull on this sftp:// location from a different computer which gave me the latest revision (5) | 00:03 |
| gwal | I think I remember why I can't use bzr+ssh: the remote location doesn't have bzr installed | 00:05 |
| dOxxx | ah yeah | 00:05 |
| dOxxx | that does make things a little harder | 00:06 |
| gwal | everything seems to be there though .. in the remote sftp:// location and my current pull of revision 5 | 00:06 |
| dOxxx | if you don't need the working tree in the remote location, you could try `bzr reconfigure --branch sftp://...` to get rid of the working tree | 00:08 |
| gwal | what does it mean to get rid of the working tree? | 00:09 |
| dOxxx | it means there is no checkout of the latest revision, it's just the .bzr directory with the revision data | 00:10 |
| dOxxx | I'm not sure if the reconfigure will work over sfpt though | 00:11 |
| dOxxx | sftp* | 00:11 |
| gwal | ok ... hang on | 00:11 |
| gwal | no .. it complains that sftp://location/.bzr/ is not a local path | 00:12 |
| dOxxx | yeah I guess it can't do it remotely | 00:12 |
| dOxxx | you'd need bzr on the remote machine to do it | 00:12 |
| gwal | yea I understand ... not sure I can get bzr on there though | 00:13 |
| gwal | but in itself this isn't inherently bad is it? | 00:13 |
| dOxxx | no, you'll just get the warning every time you push | 00:13 |
| gwal | ok, I can live with that | 00:13 |
| gwal | thanks so much for helping me with this! guess it all just boiled down to my local box holding on to its lock on the remote repository | 00:14 |
| dOxxx | yah | 00:14 |
| dOxxx | the rspush may not have released it properly when it encounted the divergent branches | 00:14 |
| dOxxx | encountered* | 00:14 |
| gwal | yea might be that | 00:15 |
| dOxxx | any particular reason you were using rspush instead of push? | 00:15 |
| gwal | as far as I understand, push doesn't transfer my local files to the remote location? | 00:15 |
| dOxxx | err... | 00:16 |
| gwal | not true? | 00:16 |
| dOxxx | what exactly do you mean by "my local files" ? | 00:16 |
| gwal | by that I mean, I bzr add something.c locally, bzr ci this change and when I do a bzr push it doesn't seem to copy those files over to the sftp:// location | 00:17 |
| gwal | sorry, I'm new to bzr so this may sound stupid | 00:18 |
| dOxxx | that's because it can't update the working tree over sftp | 00:18 |
| gwal | ah | 00:18 |
| dOxxx | the revision with that change has been pushed | 00:18 |
| dOxxx | I'm guessing rspush was able to do it though? | 00:18 |
| gwal | yes it was | 00:18 |
| dOxxx | interesting | 00:18 |
| gwal | ok I see your point, usually bzr push to a bzr+ssh location would do a remote bzr update after my local bzr push? | 00:19 |
| dOxxx | yeah | 00:19 |
| dOxxx | because it can run bzr on the remote machine | 00:19 |
| gwal | yea ok, that makes sense now | 00:19 |
| dOxxx | or at least I believe that's what it does :) | 00:19 |
| gwal | well it would make sense at any rate ;) | 00:20 |
| dOxxx | I usually use tree-less remote repos | 00:20 |
| dOxxx | since I don't need the working tree on the remote machine, just want to store the revision data | 00:20 |
| gwal | so essentially the kind I'm trying to use on my box that has no bzr installed? | 00:20 |
| gwal | that's exactly what I want. how do you go about this yourself? | 00:21 |
| gwal | what I do is bzr init local_dir and then bzr rspush local_dir sftp://location | 00:21 |
| gwal | (after a bzr ci) | 00:21 |
| dOxxx | I use launchpad primarily so it sets that up automatically but I think if you did `bzr pusg --no-tree remote-loc` for the initial push it would create a tree-less repo | 00:21 |
| dOxxx | push* | 00:22 |
| gwal | oh ok, I'll need to try that | 00:22 |
| dOxxx | ah the help for bzr push says: | 00:23 |
| dOxxx | The target branch will not have its working tree populated because this | 00:23 |
| dOxxx | is both expensive, and is not supported on remote file systems. | 00:23 |
| dOxxx | 00:23 | |
| dOxxx | Some smart servers or protocols *may* put the working tree in place in | 00:23 |
| dOxxx | the future. | 00:23 |
| dOxxx | I think "remote file systems" means protocols like sftp | 00:23 |
| dOxxx | so I'm guessing rspush created the working tree initially | 00:24 |
| dOxxx | anyway, sounds like you're sorted out? | 00:24 |
| gwal | yea it must've ... | 00:24 |
| gwal | yea man I think I am. I'll look into the --no-tree option although my current bzr version doesn't seem to know this option | 00:25 |
| dOxxx | ah :P | 00:25 |
| gwal | maybe I'll need to update my bzr version | 00:25 |
| dOxxx | you may not even need that option | 00:26 |
| dOxxx | if use push as the first command to create the remote repo | 00:26 |
| gwal | good call ... I'll give that a shot. when I read the help last time around (what you pasted above) I read the line about the working tree not being populated as meaning that my files won't get transferred | 00:28 |
| gwal | thanks to you though I kind of understand what that means now ... so will try push from now on as initial push | 00:28 |
| dOxxx | glad to help | 00:28 |
| gwal | thanks again and take care | 00:29 |
| dOxxx | cheers :) | 00:29 |
| Noldorin | hey fokls | 03:07 |
| Noldorin | i'm trying to push a branch to my FTP server... | 03:07 |
| Noldorin | i uncommitted locally than made a few more commits | 03:08 |
| Noldorin | but it says there are no new revisions to push when i try to push it from locally to the server! | 03:08 |
| Noldorin | even when i do --overwrite it still says this | 03:08 |
| Noldorin | very weird | 03:08 |
| Noldorin | any thoughts? | 03:08 |
| LarstiQ | Noldorin: are you pushing to the right location? | 12:41 |
| === yofel_ is now known as yofel | ||
| trebor_home | hi. i am new to bzr (cvs-user). are there texinfo files to download for 2.1.x (debian)? | 23:44 |
| jelmer | trebor_home: I'm pretty sure we don't have any info files in the debian package | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!