/srv/irclogs.ubuntu.com/2011/12/17/#bzr.txt

Noldorinwgz, pqm/tarmac?02:05
Noldorinwgz, wouldn't they have to poll, whatever they are?02:05
cyberkillaHello, quick question. I want to set up a central repository on a network share and have myself and others commit to it, but it never seems to save the files to the network share. Only the .bzr file is updated. Am I missing something here?16:45
cyberkillaJust to clarify: Repository on network share (NAS), checkout code to edit locally, and commit back to the main repository on the network share. That's what I thought was possible with bzr, but it isn't working out.16:46
wilxcyberkilla: You mean that the working copy is not updated?16:46
cyberkillawilx, yes, the network share only has ".bzr" in the folder. It never saves anything else.16:47
wilxWell...16:47
wilxAFAIK, you should not need a working copy for the central repo.16:48
cyberkillaThe tutorial on the bazaar website says to do a bzr push to get the initial code up into the repository, then bind to it, but it just creates a bzr file.16:48
cyberkillaThe thing is, the source code is 1.7MB and the .bzr file is 206 bytes. I, so I don't know what it has actually achieved. :(16:49
cyberkillawilx, I had assumed that myself. I had thought that perhaps it just kept all of the deltas in .bzr, and didn't need a working tree. The thing is, I don't think it is actually saving anything.16:49
cyberkillawilx, thanks for responding btw. I thought it would be a quick task, but it's fighting me at every step.16:50
wilxPersonally, I have not had any prolems with this...16:51
wilxbzr push has worked for me always.16:51
cyberkillaDo you push to a network share, or local drive?16:51
wilxI was pushing over Samba to a share.16:51
cyberkillaDoes it only copy to .bzr, and nothing else?16:52
wilxWell, I used the --no-trees switch.16:52
wilx...for the shared repo.16:53
cyberkillaThe bzr push command's manual entry says: "The target branch will not have its working tree populated because this is both expensive, and is not supported on remote file systems."16:53
cyberkillaThat suggests that it won't in fact copy the working tree (which I assume is the actual source code being versioned here)16:54
cyberkillaSo I'll only get the revision history. I just can't seem to grasp the concept of this. I followed the tutorial to the letter.16:54
wilxWhich tutorial exactly?16:55
cyberkillahttp://doc.bazaar.canonical.com/bzr.dev/en/user-guide/publishing_a_branch.html16:56
cyberkillaThat's the one, I believe.16:56
fullermdThe working tree is the exploded out files that you can edit and read and compile and whatnot.16:56
fullermdpush just pushes the history [to remote locations].16:56
wilxcyberkilla: Well, if you have followed that then you have used --no-trees option for the repository and hence it does not have any working copy.16:57
cyberkillafullermd, how do I commit changes to a central repository, so that others may checkout a branch, make changes, and commit back to the central repository? I'm sure it's my misunderstanding of how bzr works that is the problem, rather than bzr itself.16:58
vila. o O (Why mention http://wiki.bazaar.canonical.com/MatthewFuller/SpotDocs/PiecesInBrief when The main itself answers...)16:58
vilas/main/man/ damn ruining jokes tyops16:59
cyberkillawilx, oh16:59
wilxcyberkilla: The changes, files, metadata are all packed together in the .bzr directory.17:00
* fullermd points and laughs at vila.17:00
cyberkillawilx, well, that's what I had thought, but it's not including any of the changes :(17:00
wilxcyberkilla: How have you propagated the changes to the central repo?17:00
fullermdWhen you push, you push all the history, which is everything needed to _make_ the WT.  Anybody branching/pulling from it gets all that.17:00
wilxAlso, how have you committed them to your local branch.17:01
vilacyberkilla: .bzr is a directory not a file, if it's empty it means you've never successfully pushed to it17:01
fullermdIt just doesn't split out the files on the remote side.17:01
cyberkillawilx, bzr init && bzr add && bzr commit -m "Initial import" && bzr push ____17:01
vilacyberkilla: what does 'bzr info -v' says in the directory where you pushed ?17:02
vila!paste17:02
ubot5For posting multi-line texts into the channel, please use http://paste.ubuntu.com | To post !screenshots use http://imagebin.org/?page=add | !pastebinit to paste directly from command line | Make sure you give us the URL for your paste - see also the channel topic.17:02
cyberkillavila, it's not empty, it has files. It's just that the total size of the directory is under 300 bytes in size, but the code is at least 1.7MB of PHP and PNGs17:02
vilacyberkilla: then you never successfully pushed there17:03
vilacyberkilla: so maybe you pushed elsewhere17:03
vilacyberkilla: 'bzr info -v' should tell you where17:03
cyberkillavila, it creates the .bzr folder when you push, because it pushes the folder, creating it on the share. This is all very strange.17:04
fullermdDid you do an init-repo around there before you pushed?17:04
vilafullermd: nice catch ;)17:05
cyberkillafullermd, I did an init-repo in the folder that the folder being pushed was create in. e.g. R:\bzr\project and R:\bzr\project\trunk17:05
vilacyberkilla: any .bzr under  R:\bzr\project ?17:06
cyberkillafullermd, I believe so, but I'll check...17:06
cyberkillafullermd, Yes, there is one.17:07
* fullermd takes all the credit and retires in victory.17:07
* vila bows17:07
cyberkillaIs that a bad thing to do? :) I thought I was following the tutorial correctly:P17:08
vilacyberkilla: so, the current theory is that your shared repo is at R:\bzr\project and your branch is at R:\bzr\project\trunk17:08
cyberkillavila, Yes17:08
vilathis means the .bzr folder for your branch is very small and will always be17:08
cyberkillaOh!17:09
vilathe revisions are stored in the repository, the .bzr folder there contains a 'repository' folder there which doesn't exist in your branch .bzr folder17:10
cyberkillavila, thank you for enlightening me :-)17:11
vilacyberkilla: congratulations on identifying the 3 main bzr components so early ! With these pieces in mind, you're now ready to read http://wiki.bazaar.canonical.com/MatthewFuller/SpotDocs/PiecesInLength)17:11
* vila ducks and bows in direction of both wiki pages author17:12
cyberkillavila, am I right in thinking that I can point to R:\bzr\project\trunk to checkout a copy of the code, or is it more complicated than that?17:13
vilacyberkilla: perfectly right17:13
vilacyberkilla: read 'bzr help branch' and 'bzr help checkout' as they may imply different workflows17:14
cyberkillavila, excellent, I'll give it a try. Thanks again to the both of you.17:14
vilacyberkilla: if you end up using lightweight checkouts though, think twice as misunderstanding them lead to a few traps (they are fine in themselves if used as appropriate)17:15
vilacyberkilla: experimenting  with 'bzr qlog' is also great to visualize how revisions move from a branch to another17:16
fullermdYeah, vila used lightweight checkouts once, and look what it did to his tpying.17:17
cyberkilla:)17:18
cyberkillaI have a couple of years of revision history, but I don't think it'll be too big of an overhead to checkout in full.17:19
vilafullermd: correction, I never used them as I feel I'm naked (no bragging implied, it's just too cold around there to be wearing only a leaf, a branch is required)17:19
cyberkillaActually, earlier today I tried bzr join to try to version the parent folder. You see, I used to use a standalone tree on project/src (another project), but inside of project were project/bin project/tools and I wanted to versiont those too.17:21
fullermdWell, great.  Now I have to go bleach my mind's eye after that...17:21
cyberkillaSo, I did bzr init on ./project, then bzr join src to pull it in. Seemed to work, but then everything imploded and bzr add started adding .bzr.retired files, bzr update through python errors, and I decided I'd just start from scratch :p17:23
fullermdYou wouldn't do an add after a join.  Join is handwavingly like merging another branch into a subdir, so just like after a merge, you've got that as a pending change to commit.17:24
cyberkillafullermd, I tried it after committing gave me errors about unexpected file deltas, or something similarly confusing. I had probably did it in the wrong order. I have a backup, so all is not lost.17:26
cyberkillaBut for now, my problem is solved. Thanks again :)17:26
fullermdBackup?!  Pfui.  Backups are for pessimists.17:26
cyberkillafullermd, I like to be in a position to mindlessly press buttons without there being dire consequences. :-P17:28
meoblast001hi19:38
meoblast001suppose i want to develop something outside the main branch, but i will be responsible for merging it into the main branch19:39
meoblast001do i need to maintain 2 separate trees of the project?19:39
vilameoblast001: you don't need to, but the workflow will be easier20:15
meoblast001ah, ok20:15
vilaIf the size is not an issue, you'd be better served by 2 working trees, and if they share their repository, the overhead is only the size of the working tree20:16
meoblast001vila: share the same repository?20:20
meoblast001ooh, if i store them in one working tree?20:21
vilano, a working tree needs a branch, a branch needs a repository20:22
vilabut several branches can share the same repository20:22
meoblast001oh20:22
vilahttp://wiki.bazaar.canonical.com/MatthewFuller/SpotDocs/PiecesInBrief20:22
vilameoblast001: how big is your working tree ? ('bzr info -v' will tell you)20:23
meoblast001vila: it doesn't give it as a size20:24
meoblast001just amounts of files20:24
meoblast001would it be a good idea to have 2 branches, and 2 branches on the server... separate directories and working trees.. push my personal one to my personal branch on the server20:25
vilayup, any file browser can give you the whole size (as well as the one of the .bzr directory)20:25
meoblast001then, go to my main branch on my local machine, and merge in the remote personal directory when i'm ready20:25
meoblast001and push that up to the main remote directory20:25
vilayes20:25
meoblast001and that would be a normal way of doing things where i shouldn't expect problems?20:26
meoblast001also, 77.6 KB.. it's a small project so far20:26
Noldorinhi folks20:51
Noldorindoes anyone know what the path in bzr+ssh URLs corresponds to on the fS?20:52
jelmerNoldorin: hi20:55
Noldorinhi jelmer20:55
jelmerNoldorin: whatever the remote SSH server does20:55
Noldorinjelmer, it's openssh sshd20:55
Noldorinunder cygwin20:55
jelmerNoldorin: where does it end up if you ssh in manually?20:56
Noldorinjelmer, the home directory which i configured :-)20:56
jelmerNoldorin: and what is / ?20:57
jelmerNoldorin: all paths will be relative to /, and ~ is translated to the home directory20:57
Noldorinjelmer, how do i find out what / is ?20:58
jelmerNoldorin: "ls /" ?20:59
Noldorinjelmer, contains bin, dev, etc, home, lib, proc...21:00
Noldorinusr21:00
Noldorinvar21:00
Noldorintmp21:00
jelmerNoldorin: where / is depends on your server configuration, which will depend on cygwin21:06
Noldorinjelmer, c:\cygwin probably...?21:09
Noldorinjelmer, but bzr+ssh most deinfitely treats root as my home dir21:09
jelmerNoldorin: does "ssh yourhost ls /" list the contents of your home dir?21:13
Noldorinyes21:13
Noldorinerr21:13
Noldorinwait a sec21:13
Noldorinjelmer, can't do that with putty21:14
vilameoblast001: sry, was afk, yes, perfectly normal21:19
meoblast001ah, ok, thanks :)21:19
meoblast001vila: i now have an interesting problem, btw21:19
meoblast001well, it's nothing you can fix, nor i :P21:20
meoblast001i use Bazaar on my personal projects, and Git at work now21:20
meoblast001and now i find myself joining #git asking how to make Git do what Bazaar does, and joining #bzr asking how to make Bazaar do what Git does21:20
Noldorinjelmer, so?21:20
vilameoblast001: as long as you find a way to address your needs, I don't see where the problem is ;)21:24
meoblast001yup :P21:25
Noldorinjelmer, brb anyway21:53
jelmerNoldorin: wb23:01
Noldorinty jelmer23:01
jelmerNoldorin: Sorry, I have no idea of to use ssh on windows exactly23:01
Noldorinjelmer, well it's exactly lke openssh but just running in cygwin ;-)23:02
Noldorinso should be quite simple23:02
Noldorinjelmer, shouldn't bzr+ssh urls be root-based though?23:07
Noldorinas you said earlier23:07
Noldorineven that's not happening23:07
Noldorinso very weird23:08
jelmerNoldorin: bzr basically runs "ssh YOURHOST bzr serve --directory=/ --allow-writes"23:15
jelmeroh, and --inet23:15
Noldorinjelmer, what's inet?23:20
Noldorin  zzz23:32
Noldorin*thinks jelmer is on a cycle of chat 1 minute, afk 10 mins, repeat*23:33
jelmerNoldorin: inet means using stdin/stdout23:35
jelmerNoldorin: (used for inetd on POSIX)23:35
Noldorinok23:35
Noldorini see23:35
Noldorinjelmer, so can i change these default options maybe?23:35
jelmerNoldorin: which default options?23:36
Noldorinhuh?23:36
Noldorinthe bzr serve ones23:36
jelmerNoldorin: I don't see how that would help.23:36
Noldorinjelmer, changing directory maybe?23:36
jelmerNoldorin: the directory is already set to /23:36
Noldorinjelmer, yeah but i want something like /cygdrive/c/projects don't i? :-P23:37
jelmerNoldorin: does "bzr log bzr+ssh://host/cygdrive/c/projects/.../" work?23:39
jelmerNoldorin: / should already mean paths are relative to the root.23:39
Noldorinjelmer, but you're confusing the windows and cygwin roots...23:39
jelmerNoldorin: bzr+ssh paths would be relative to the cygwin root23:40
Noldorinyes that's my point23:40
Noldorin:-P23:40
Noldorinnot what i want though23:40
Noldorinone sec23:40
Noldorinlet me test23:40
jelmerNoldorin: Sorry, I have a hard time following what you're trying to do and what exactly doesn't work..23:40
Noldorinjelmer, that cmd (bzr log ) returns "not a branchj"23:41
Noldorinjelmer, the problem seems to be that bzr is using paths relative to the home directory *regardless* of what i give it23:42
Noldorinjelmer, and we've confirmed that a normal ssh in detects the correct route23:45
Noldorinso sounds like a bzr bug to me :-(23:45
Noldorinjelmer, some way to debug bzr maybe?23:51

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!