|
[00:58] <mr-rus1> how to I checkout an svn branch/trunk using ubuntu bzr? |
|
[00:58] <mr-rus1> bzr-svn doesn't exist and I can't find commands on the website for what to do. |
|
=== mr-rus1 is now known as mr-russ |
|
[00:59] <jelmer> mr-russ: ? ubuntu has bzr-svn |
|
[00:59] <mr-russ> I installed bzr-svn package, but there is only a bzr command |
|
[00:59] <jelmer> ah |
|
[00:59] <jelmer> bzr-svn allows the regular bzr command to access svn urls |
|
[01:00] <mr-russ> ah, then I did have it sort of working. |
|
[01:00] <mr-russ> how then do I commit without committing to svn, and only commit to the bzr tree? |
|
[01:01] <jelmer> mr-russ: If you create a standalone branch it won't automatically commit to svn |
|
[01:02] <mr-russ> ah, so you need to pass that as a parameter. |
|
[01:02] <jelmer> ? |
|
[01:02] <mr-russ> Unfortunatley I'm too new at bzr altogether for this to be as easy as it might be. |
|
[01:03] <jelmer> if you create a branch by running "bzr branch svn://..." it won't automatically commit to svn |
|
[01:04] <mr-russ> I'm using https:// I hope that doesn't make a difference. |
|
[01:04] <jelmer> no |
|
[01:04] * mr-russ waits for it to download to see how we go at attempt 2. |
|
[01:09] <mathrick> mr-russ: bzr branch off an SVN repo is the same as a branch off any other repo, it's independent and separate from the original branch |
|
[01:16] <mr-russ> for some reason my first attempt committed to svn. but it doesn't now. |
|
[01:16] <mr-russ> thanks for the help. |
|
[01:16] <mr-russ> I'll now work out how to commit the changes to svn. |
|
[01:17] <james_w> mr-russ: if you are now using the result of "branch" then you only commit locally. Use "bzr push" to move the changes to svn. |
|
[01:18] <james_w> see "bzr help bind" if you wish to make it default to commit to both. |
|
[01:21] <mr-russ> a basic tutorial on the subversion page would be quite helpful. especially for those of us coming from SVN. |
|
[01:21] <mr-russ> because bzr push doesn't automatically put the tree back in the same place you got it from. |
|
[01:21] <james_w> mr-russ: to which subversion page do you refer? |
|
[01:22] <mr-russ> http://bazaar-vcs.org/BzrForeignBranches/Subversion |
|
[01:22] <james_w> and what do you mean by that statement? |
|
[01:23] <mr-russ> coming from svn, when you checkout something. when you hit svn commit, it commits to the same svn tree. |
|
[01:24] <mr-russ> bzr push to an svn tree MAKES you specify the location. |
|
[01:24] <mr-russ> I would have expected it cached as the "default" |
|
[01:25] <mr-russ> But that is just my gut expectation as an SVN user. |
|
[01:30] <jelmer> mr-russ: bzr does do that if you used "bzr co" |
|
[01:30] <jelmer> it doesn't when you use "bzr branch" |
|
[01:30] * mr-russ needs to read more about how to use bzr. |
|
[01:31] <mr-russ> and bzr co commits straight to the SVN repository. |
|
[01:33] <james_w> mr-russ: and after the first bzr push then it will use that location by default next time, so it should be a one time thing. |
|
[01:33] <mr-russ> ah. |
|
[01:34] <mr-russ> I'll read through the whole bzr manual and see how I go from there. |
|
[01:34] <mr-russ> thanks very much for your guidance all. |
|
[01:34] <james_w> mr-russ: no problem, feel free to ask any more questions. |
|
=== asac__ is now known as asac |
|
=== cprov is now known as cprov-ZzZ |
|
=== jdong is now known as PmDematagoda |
|
=== PmDematagoda is now known as jdong |
|
=== asac_ is now known as asac |
|
=== luks_ is now known as luks |
|
=== weigon__ is now known as weigon |
|
[14:25] <c1|freaky> hi all. how can i checkout a repository without any history or other files, just as if i would have downloaded a package or smth.? |
|
=== Verterok is now known as Verterok_ |
|
[14:33] <Parker-> export? |
|
[14:36] <c1|freaky> ok |
|
[14:36] <c1|freaky> thank you |
|
[14:42] <c1|freaky> doesnt work can someone give me an example |
|
[14:42] <c1|freaky> ? |
|
[14:48] <Parker-> you can only export branch... not repository |
|
[14:52] <james_w> c1|freaky: also checkout --lightweight |
|
[14:52] <james_w> that gives you slightly more than export, but no history. |
|
[14:52] <james_w> c1|freaky: bzr export to-this from-URL-of-branch |
|
[15:01] <c1|freaky> can i only export one subdirectory of a project |
|
[15:08] <james_w> no, that's not supported by bzr, but it is quite easy to add on top. |
|
[15:41] <c1|freaky> james_w: how to add something on top? |
|
[15:42] <james_w> c1|freaky: well you can extract to a directory and then just delete everything that you don't want. |
|
[15:42] <james_w> export to a directory, sorry. |
|
[15:43] <c1|freaky> ok thank you |
|
[16:14] <brlcad> does anyone know of a project that provides a "libbazaar"? i.e. C library interface bindings for creating/reading/writing a bazaar repo for directly integrating into a C/C++ application without some wrapper layer? |
|
[16:14] <brlcad> from my searches, it looks like the answer is a solid 'no', but I figured if anyone heard of someone working on such an effort, it'd be in here.. |
|
[16:39] <james_w> brlcad: yeah, as far as I know that is a definite no. |
|
[16:48] <brlcad> james_w: mm, darn but thanks |
|
[17:27] <abentley> brlcad: what for? |
|
[17:36] <brlcad> for integrating into a c/c++ app as a revisioned data store backend for storing data created/used by that app |
|
=== jelmer_ is now known as jelmer |
|
[17:59] <aadis> join #actionscript |
|
[17:59] <aadis> heh, sorry |
|
[18:21] <abentley> brlcad: It is possible to use a python library from C/C++, just not very straightforward. |
|
[19:06] <brlcad> abentley: of course, just such wrapper layers are usually quite distasteful to have at all, much less maintain over a long term -- that's why I specifically said without it, just not worth it that way |
|
[19:07] <abentley> Of course, a C/C++ library is even more work to maintain over a long term, and no one so far is interested in doing that. |
|
[19:07] <brlcad> I have a workable path through libsvn, but it means I'll have to resort to repository synchronization into the application layer |
|
[19:08] <brlcad> that certainly depends on the dev audience, for the bzr devs that may very well be the case |
|
[19:18] <brlcad> in any regard, thanks for the insight/responses |
|
[19:35] <NichardRixon> $ bzr init-repo --no-trees sftp://mrlachatte_flyinformation@ssh.phx.nearlyfreespeech.net/ |
|
[19:35] <NichardRixon> mrlachatte_flyinformation@ssh.phx.nearlyfreespeech.net's password: |
|
[19:35] <NichardRixon> bzr: ERROR: Permission denied: "/.bzr": [Errno 13] Permission denied |
|
[19:35] <NichardRixon> what could be causing this error? |
|
[19:42] <NichardRixon> (using bzr 1.2 on vista in msys) |
|
[19:46] <ryanakca> How can I pull from a branch without putting it on a webserver or on launchpad? I have ssh access to the server where the branch is located |
|
[19:48] <frsk> bzr pull sftp://user@host/path should work |
|
[19:49] <ryanakca> frsk: ok, thanks :) |
|
[19:49] <jdong> that's the loveliness of bzr :) No server needed |
|
[19:50] <jdong> hey jelmer , how much RAM is branching a 16k rev svn repo supposed to take? |
|
[19:50] <jdong> at rev 6k, I'm seeing 400MB or so usage |
|
[19:50] <jdong> I've applied the python bindings memory leak patch backported from Hardy |
|
[19:51] <aadis> NichardRixon: it seems to try to create a directory .bzr in your / dir (C:?). Do you have enough permissions? |
|
[19:51] <NichardRixon> I would assume so |
|
[19:51] <NichardRixon> I mean, if I ssh in and run mkdir .bzr it works fine |
|
[19:51] <aadis> mkdir /.bzr ? |
|
[19:51] <NichardRixon> oh, hrm |
|
[19:52] <NichardRixon> how can I fix this problem :< |
|
[19:52] <abentley> NichardRixon: Your command is trying to create a repository in the root directory of your server. User accounts do not typically have create rights to the root directory. |
|
[19:52] <aadis> ah, sftp defaults to root dir. |
|
[19:52] <abentley> You would specify a directory you do have rights to, like your home directory. |
|
[19:53] <NichardRixon> I assume there's a flag I can set? |
|
[19:53] <radix> yeah. you didn't put a path at the end of that URL |
|
[19:53] <abentley> e.g. bzr init-repo --no-trees sftp://mrlachatte_flyinformation@ssh.phx.nearlyfreespeech.net/~/ |
|
[19:53] <NichardRixon> hrm |
|
[19:54] <NichardRixon> bzr: ERROR: No such file: '': [Errno 2] No such file |
|
[19:54] <abentley> Perhaps you don't have a home directory? |
|
[19:54] <abentley> What directory do you have access to? |
|
[19:54] <NichardRixon> but I do :( |
|
[19:55] <radix> huh, I didn't know "~" works. |
|
[19:55] <NichardRixon> if I go cd ~ it works fine |
|
[19:55] <jdong> try an absolute path to your intended destination? |
|
[19:55] <radix> or maybe it doesn't? :) |
|
[19:55] <jdong> maybe you don't have a home via sftp |
|
[19:55] <abentley> radix: It works on sftp, but not on bzr+ssh |
|
[19:55] <jdong> radix: it works for sftp |
|
[19:55] <NichardRixon> would /home/ work at the end of the path? |
|
[19:55] <radix> NichardRixon: /home/yourusername/ should work. but so should ~ |
|
[19:56] <NichardRixon> bzr: ERROR: Permission denied: "/home/.bzr": [Errno 13] Permission denied |
|
[19:56] <radix> NichardRixon: /home/yourusername, not /home. |
|
[19:57] <NichardRixon> bzr: ERROR: No such file: '/home/mrlachatte': [Errno 2] No such file |
|
[19:57] <NichardRixon> I've got /home when I ssh in |
|
[19:57] <radix> NichardRixon: it sounds like the server setup is broken |
|
[19:57] <abentley> It looks like there's a bug that server/~/ must be followed by a directory name. |
|
[19:57] <radix> NichardRixon: what happens if you "echo $HOME" when you ssh in? |
|
[19:58] <radix> abentley: oops |
|
[19:58] <NichardRixon> \/home/private |
|
[19:58] <NichardRixon> without the \ |
|
[19:58] <radix> NichardRixon: that's... weird |
|
[19:59] <radix> NichardRixon: can you create files in /home/private? maybe you will need to put your bzr branches in there. |
|
[19:59] <NichardRixon> yeah, I'm trying that now |
|
[19:59] <radix> but it's very strange that your home directory isn't /home/<username> |
|
[19:59] <NichardRixon> maybe I can use ~/bzr/ |
|
[20:00] <radix> NichardRixon: yeah, maybe that'll work. |
|
[20:00] <NichardRixon> yay! |
|
[20:00] <NichardRixon> no errors :) |
|
[20:00] <radix> hooray |
|
[20:00] * radix gets lunch |
|
[20:02] <NichardRixon> huh, I'm not seeing anything in ~/bzr/, though |
|
[20:02] <NichardRixon> ls -A shows me nothing |
|
[20:06] <radix> NichardRixon: did you mean to type "ls -a"? |
|
[20:06] <radix> oh, hmm, -A |
|
[20:06] <radix> NichardRixon: that's strange :) |
|
[20:06] <radix> NichardRixon: you're typing "ls -A ~/bzr/" ? |
|
[20:10] <jelmer> jdong: it shouldn't really leak |
|
[20:10] <jelmer> 25k revisions is easily possible here |
|
[20:16] <NichardRixon> friggin' weird |
|
[20:16] <NichardRixon> suddenly my computer started thinking I was pressing alt and shift continuously |
|
[20:16] <NichardRixon> and left arrow or something |
|
[20:16] <NichardRixon> so all my messages started typing backwards |
|
[20:16] <NichardRixon> anyways, ls -A problem still stands |
|
[20:17] <radix> heh |
|
[20:18] <jdong> jelmer: hmm 8k revisions, 600MB RAM :( |
|
[20:19] <lifeless> NichardRixon: if I understand correctly you can push but the content is not there when you look for it ? |
|
[20:19] <jelmer> jdong: Are you sure you've backported the fix correctly and regenerated the SWIG code? |
|
[20:19] <NichardRixon> I haven't pushed yet |
|
[20:19] <NichardRixon> I'm just trying to do an init |
|
[20:19] <jdong> jelmer: I'm 99% certain |
|
[20:20] <jdong> grumble maybe I should just do this on my hardy box and preserve my sanity |
|
[20:20] <lifeless> NichardRixon: whats the exact init command line you are running ? |
|
[20:20] <NichardRixon> $ bzr init sftp://mrlachatte_flyinformation@ssh.phx.nearlyfreespeech.net/~/bzr/Denkatsu/ |
|
[20:21] <jelmer> jdong: It may well be that not all the required changes are backported to 1.4 |
|
[20:21] <radix> NichardRixon: oh, that command should create .bzr in ~/bzr/Denkatsu/ |
|
[20:22] <radix> NichardRixon: not in ~/bzr/ |
|
[20:22] <NichardRixon> yeah, and there's nothing in /bzr/ at all |
|
[20:22] <NichardRixon> er, ~/bzr/ |
|
[20:22] <lifeless> NichardRixon: does it fail ? |
|
[20:22] <NichardRixon> nope |
|
[20:22] <NichardRixon> no errors |
|
[20:22] <lifeless> NichardRixon: so echo $? right after it echos 0 ? |
|
[20:22] <radix> I don't see what the problem is. |
|
[20:23] <radix> oh, Denkatsu doesn't even exist? |
|
[20:23] <NichardRixon> radix, there should be a Denkatsu directory in ~/bzr/, right? |
|
[20:23] <NichardRixon> yes |
|
[20:23] <NichardRixon> lifeless, where does it echo 0? |
|
[20:23] <lifeless> NichardRixon: run this "bzr init sftp://mrlachatte_flyinformation@ssh.phx.nearlyfreespeech.net/~/bzr/Denkatsu/ && echo ok" |
|
[20:23] <lifeless> NichardRixon: tell me if it prints 'ok' |
|
[20:24] <NichardRixon> bzr: ERROR: Already a branch: "sftp://mrlachatte_flyinformation@ssh.phx.nearlyfreespeech.net/~/bzr/Denkatsu/" |
|
[20:24] <radix> there is something weird with that server. |
|
[20:24] <radix> maybe you should avoid use of ~ |
|
[20:25] <NichardRixon> ....oh, interesting |
|
[20:25] <radix> maybe the sftp server thinks that ~ is something different than the shell does. |
|
[20:25] <NichardRixon> under /home/public/bzr there's Denkatsu |
|
[20:25] <NichardRixon> how intriguing |
|
[20:25] <radix> oi. |
|
[20:26] <lifeless> NichardRixon: my next question was 'please run "ssh mrlachatte_flyinformation@ssh.phx.nearlyfreespeech.net pwd" ' |
|
[20:27] <radix> apparently when he sshes in he gets sent to /home, and $HOME is /home/private |
|
[20:27] <NichardRixon> just a straight ssh in dumps me into /home/public |
|
[20:28] <radix> <NichardRixon> I've got /home when I ssh in <-- is it putting you in random different directories each time you log in? ;) |
|
[20:28] <NichardRixon> :D |
|
[20:28] <NichardRixon> non-deterministic ssh |
|
[20:34] <lifeless> NichardRixon: does the presence of the username in the command line alter things? |
|
[20:34] <NichardRixon> eh? |
|
[20:34] <NichardRixon> it's working now |
|
[20:34] <lifeless> NichardRixon: ok good; enjoy |
|
[20:34] <NichardRixon> thank you :) |
|
[21:00] <NichardRixon> arghhhhh |
|
[21:00] <NichardRixon> so I've commited everything to ~/bzr/Denkatsu/ |
|
[21:01] <NichardRixon> but there are no files besides .bzr inside that folder :( |
|
[21:02] <awilkins> This a push? Push doesn't update the tree |
|
[21:05] <NichardRixon> wait whoops, wasn't doing ls -A |
|
[21:05] <NichardRixon> there's a .bzr folder and the world is right |
|
=== mwhudson_ is now known as mwhudson |
|
[22:56] <igc> morning |
|
[22:58] <bmonty> can anyone help with using bzrlib? I'm trying to restrict the results from workingtree.changes_from to a specific dir. |
|
[23:02] <lifeless> specific_paths=['dir'] |
|
[23:03] <bmonty> does it have to be a relative path (or is there any requirement?) |
|
[23:03] <lifeless> yes, tree relative path |
|
[23:03] <bmonty> thanks |
|
[23:03] <lifeless> if you have an absolute path, tree.relative_path(abs_path) it first |
|
[23:04] <bmonty> ah, that helps alot! |
|
[23:05] <lifeless> because there can be N aliases to a tree, we only work with relative paths in the tree api (with some very, and odd, exceptions) |
|
[23:05] <lifeless> (symlinks, mount points etc generate aliases) |
|
[23:21] <ubotu> New bug: #192743 in bzr-svn "bzr-svn is irritating when in a (non-svn) subdirectory of an svn working tree" [Wishlist,Confirmed] https://launchpad.net/bugs/192743 |
|
|