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