/srv/irclogs.ubuntu.com/2008/03/24/#bzr.txt

dhon_hi all, I've got files in d:\project\subdir under version control and I'd like to add files in d:\project. I'd say I need to change the root bzr directory to d:\project - how do I do that & preserve the history in subdir?00:10
dhon_I guess I could just move the .bzr directory and then "bzr move --after" all the original files into subdir?00:12
dhon_thoughts?00:12
PengYou could probably do this with rich roots.00:15
dhon_what are rich roots?00:17
PengThe / directory entry of the branch is versioned. I'm pretty sure it's possible to move it.00:19
dhon_Peng: so I could convert the repo to rich roots format and then move the root somehow?00:22
Pengdhon_: Maybe.00:23
PengI dunno.00:24
PengI just tried it and it tracebacked.00:24
dhon_Peng: what commands did you use?00:30
Pengdhon_: "bzr mv . foo". Traceback. :)00:31
PengI'm pretty sure rich root formats should be able to support that; perhaps bzr doesn't yet though.00:32
jelmerPeng: I doubt that will ever work - it doesn't even work for a regular mv00:39
PengOk.00:39
PengShucks.00:39
jelmerPeng: Although the error message should obviously be more sensible00:40
jelmerPeng: what exactly are you trying to do?00:40
PengI was seeing if it was possible to move the root.00:41
jelmerPeng: it is certainly possible to change the root - see the split command00:42
dhon_jelmer: I was trying to move the root from d:\project\subdir to d:\project00:50
dhon_so I could add files at that level00:50
dhon_I want the files in subdir to stay there (and to keep their history)00:51
dhon_on another note: is it possible to "branch" or "copy" a single file in a repo into two separate files?00:54
dhon_eg 1.txt to 1a.txt & 1b.txt?00:54
jelmerdhon_: "bzr join" should be able to do that01:07
jelmerdhon_: (moving the root from d:\project\subdir to d:\project)01:08
jelmerdhon_: There's no way to split a file at the moment01:08
dhon_jelmer: thanks - help shows join as still experimental as of 1.2 so I think I'll stay clear for the moment01:38
=== jamesh__ is now known as jamesh
=== mark1 is now known as markh
Pengjelmer: Is it just me, or did you define CachingParentsProvider twice?07:24
Odd_Blokejelmer: Congrats on the release!08:22
=== RAOF_ is now known as RAOF
aantnhello09:56
aantndoes bzr uncommit actually revert your files09:56
bob2no09:57
aantnI'm trying to change the revision log and bzr uncommit seems to be the only way to do so09:57
bob2(the point of uncommit is to not revert the files)09:57
aantnbob2: what does the --dry-run flag do?09:57
=== aantn is now known as aantn|pancakes
bob2just show you what it would do (which is not all that useful for 'uncommit')10:03
=== aantn|pancakes is now known as aantn
=== doko_ is now known as doko
=== mw|out is now known as mw
fbondHi, I'm seeing "authorization failed" trying to push to an svn repository.  svn has already cached my credentials.  What am I missing?13:36
jelmerfbond: have you prefixed the URL with svn+ ?13:37
fbondOh, hmm...13:37
fbondYes.13:37
fbondPushing to svn+http://...13:37
jelmerwhat os are you on? The caching trick doesn't work on Windows or Mac OS X13:37
fbondOh, maybe...13:37
fbondI'm on LInux13:37
fbondBut I'm pushing to the trunk URL, should I instead be pushing to the repository root?13:38
jelmerno, you should indeed be pushing to the trunk URL13:38
fbondOh, okay.13:38
jelmercommitting to this repository using SVN works ok, without any passwords being prompted?13:38
fbondYep, that's right.13:38
fbondbzr: ERROR: Permission denied: ".": CHECKOUT of '/logistix/!svn/ver/183/trunk/pkg-src': authorization failed (http://svn.local.network)13:38
fbondThe error is on CHECKOUT, which is interesting...13:39
fbondI'm using bzr-svn 0.4.8, bzr 1.213:41
fbondjelmer: I'm using a bzr branch, not an svn wc.  That's normal, right?13:42
fbondjelmer: i.e. I made the branch with `bzr branch ...'; is this even relevant?13:42
jelmerfbond: yeah, that all sounds fine13:43
jelmerfbond: what version of svn are you using?13:44
fbondOn my workstation: version 1.4.4 (r25188)13:44
fbondOn the server: version 1.3.2 (r19776)13:45
fbondjelmer: Do you need mod_svn version info?13:45
jelmerOdd_Bloke: thanks :-)13:45
jelmerPeng: Whoops, fixing..13:46
jelmerfbond: Sorry, no idea13:48
jelmerfbond: and you were able to create a bzr branch of the svn branch earlier without problems, or does that not require authorization?13:49
fbondjelmer: only write access requires auth.13:55
fbondjelmer: I'll try making the branch again, I think I made it with an earlier version of bzr/bzr-svn...13:56
jelmerfbond: that shouldn't be relevant13:56
fbondjelmer: Hmm.  Is there any way to turn on debug logging so I can see what's going on?13:56
jelmerfbond: running bzr with -Dtransport will print to ~/.bzr.log what it is trying to do13:57
fbondjelmer: thanks!13:59
jelmerfbond: there is no way to debug the authentication step though - that all happens deep down inside the subversion libraries13:59
rexbronandrea-bs: bzr builddeb does not use LP as it's bugtracker, do you have a link to the upstream one?14:05
andrea-bsrexbron: the exception was raised by bzr itself, so you should file a bug against bzr14:07
rexbronandrea-bs: kk14:07
jelmerandrea-bs: afiak it just uses the debian bugtracker14:07
andrea-bsjelmer: thanks14:08
rexbronandrea-bs: https://bugs.edge.launchpad.net/bzr/+bug/20601314:14
ubotuLaunchpad bug 206013 in bzr "bzrlib.errors.ObjectNotLocked: KnitPackRepository('...') is not locked error when using --merge mode" [Undecided,New]14:14
andrea-bsthanks rexbron14:14
rexbronI would still like to file a bug against bzr-builddeb for the uncommited changes problem14:15
rexbrondoes anyone have a link to their tracker?14:15
james_wrexbron: bugs.launchpad.net/bzr-builddeb14:16
rexbronjames_w: I was intending to file it against the upstream code base14:16
james_wrexbron: I'll move the existing bug over, thanks.14:17
rexbronok will post a link soon14:17
james_wrexbron: ah, I never enabled launchpad bugs for it, I'll move it to the Ubuntu package for now.14:19
james_wrexbron: please don't use pastebin for tracebacks on bug reports, as they expire.14:20
rexbronI will not in future, I just looked at the scroll back from an earlier conversation14:20
andrea-bsrexbron: mh... strange... I'm not able to reproduce the situation14:22
rexbronandrea-bs: Could be a pecurilarity of the branch14:23
andrea-bsrexbron: could you give me the exact command you used, please?14:23
=== kiko-afk is now known as kiko
rexbronandrea-bs: just to remind you, this is from a script not from the commandline14:24
andrea-bsrexbron: oh, right14:24
rexbronI am making this call:14:24
rexbronbuilddeb.run(branch=self.debianLocalLocation, result='./build-area', orig_dir='./', builder='dpkg-buildpackage ' + self.debuildOptions, merge = True)14:24
fbondjelmer: got my issue resolved; svn was acting *very* oddly...14:24
fbondjelmer: it seems that it cached auth info that worked for me, but wasn't my user, or something similar.14:25
fbondI minimized the server-side config to allow just me, and it asked for a new password.14:25
fbondDunno14:25
fbondFixed now, anyway.14:25
rexbronhttps://bugs.edge.launchpad.net/ubuntu/+source/bzr-builddeb/+bug/20602114:27
ubotuLaunchpad bug 206021 in bzr-builddeb "builddeb should raise a python exception when the .run() method is called and there are uncommited changes to the working tree" [Undecided,New]14:27
rexbronandrea-bs: as for the first bug I reported, it could have something to do with the watch file not existing14:29
andrea-bsrexbron: does "debian.bleedingedge/.bzr" exist?14:30
ubotuNew bug: #206013 in bzr-builddeb "bzrlib.errors.ObjectNotLocked: KnitPackRepository('...') is not locked error when using --merge mode" [Undecided,New] https://launchpad.net/bugs/20601314:30
rexbronandrea-bs: yes, otherwise bd would not work if the orig-dir is set correctly14:31
fbondjelmer: I probably would have seen the issue right away in ~/.subversion/auth/svn.simple; everything is in plain text in a file whose name looks like a hash.14:32
fbondjelmer: may want to suggest that if anyone else asks.14:32
fbondjelmer: also, this is an interesting passage from the svn book:14:33
fbondhttp://svnbook.red-bean.com/en/1.4/svn.serverconfig.pathbasedauthz.html; Partial Readability and Checkouts14:33
fbondjelmer: thanks again14:33
andrea-bsrexbron: sorry, I can't reproduce it: I get every time a IOError (No such file or directory)  :(14:40
rexbronandrea-bs: try and pull this branch https://code.edge.launchpad.net/~ubuntu-bleedingedge/blender/debian.bleedingedge14:42
andrea-bsrexbron: done14:43
rexbronstill the same error?14:43
andrea-bsrexbron: there's no "blender-svn.py" file14:43
rexbronandrea-bs: copy the bzr-bd.run() method I posted (replacing the varriable where nessicary) and try it out14:44
andrea-bsrexbron: Could not find the upstream tarball after uscan14:47
rexbronit won't as I am creating it at run time14:47
andrea-bsrexbron: I've tried with all possible orig-dirs, they all raise a good exception to me14:52
rexbronandrea-bs: Could it be version specific?14:53
andrea-bsrexbron: probably, which version of bzr and builddeb are you using?14:53
rexbronI am running bzr 1.0 and bd 0.9014:54
rexbronUbuntu Gutsy with backports14:54
andrea-bsoh, now I understand14:54
rexbron:)14:54
andrea-bsI'm using bzr 1.2.0.candidate.1 and builddeb 0.92.0dev014:54
* rexbron appolgises not not mentioning this sooner14:55
andrea-bsyou told me you were using the 1.0 so I was thinking you were on hardy14:55
andrea-bsI mark the bug as "Fix released" so14:55
rexbronandrea-bs: wait14:55
rexbronI will try to reproduce it on hardy and if not, we can mark it as released14:55
andrea-bsrexbron: sure14:55
andrea-bsrexbron: ok, great idea14:56
andrea-bsrexbron: generally I prefer to close bugs and reopen them because sometimes the reporters forget to tell if the bug still occur, so I'm going to mark it "Incomplete": it will expire after 60 days14:58
rexbronok14:58
james_wrexbron: the raising an exception thing is completely different in newer releases.15:09
james_wrexbron: it doesn't complain at all and just builds the working tree.15:09
rexbronjames_w: ok15:12
c0lehello people..16:08
c0leI have a doubt with bzr-svn ..16:08
james_whi c0le16:09
c0lejames_w: I noticed that bzr-svn is adding an entry to the bzr:revision-id:v3-trunk property of svn every time I do a commit..16:10
c0leDoes this list of entries in the property keep increasing ?16:10
c0leor does it get recycled after reaching a max number of entrieS?16:11
james_wI don't know, I think it keeps increasing.16:12
c0lejames_w: Ouch :-S that would look bad after a 1000 such commits..16:12
datoI think that entry contains the full revision history16:12
datoso yes, it'll increase afaik16:13
james_wc0le: are you using trac?16:13
c0lejames_w: Yes, and I can see the list increasing over each commit..16:13
c0lejames_w: i.e., trac shows it in the changeset..16:14
james_wc0le: I think there's a way to turn of the display of them.16:14
c0lejames_w: Aw.. something like 'ignore property'?16:15
james_wc0le: I've no idea what the option is, I just think I remember someone mentioning such a thing before.16:16
c0leHmm.. I wonder how git-svn does this tracking..16:16
c0lejames_w: ok.. i'll google on that..16:16
james_wit doesn't16:16
c0lejames_w: ah, ok..16:17
=== kiko is now known as kiko-fud
* lamont tries again to understand how to break from bzr's belief that he wants a directory-per-branch and create a single working tree with multiple branches in it that he can switch between17:08
lukslamont: bzr init-repo --no-trees foo; bzr init foo/branchA; bzr co --lighweight foo/branchA workingtree17:10
luksthen you can have as many treeless branches under foo as you want17:10
luksand switch the working tree with bzr switch17:10
jelmerc0le: git-svn doesn't do tracking as far as I know17:11
jelmerc0le: bzr-svn 0.5 will hopefully support storing that sort of metadata in revision properties rather than file properties17:11
* lamont wonders "what sort of tracking"?17:13
jelmerlamont: All bzr-specific metadata17:15
lamontah, ok17:15
jelmerlamont: so it is possible to push a bzr branch into svn and then create that exact same branch again from the data pushed into svn17:15
james_wjelmer: isn't it that git doesn't need to, as its model doesn't create a parallel imports problem?17:20
james_wlamont: cbranch from bzrtools may also help with that workflow.17:20
luksjames_w: it still stores more metadata than svn can17:20
datolike full author name17:21
luksauthor name, author date, etc.17:21
datoor timezone17:21
jelmerjames_w: it reduces the need for full round-tripping support17:21
james_wah, ok.17:22
MikeJJhi, i'm trying to install Bazaar on windows following the quick install guide (the python one), but i get stumped here . . .17:57
MikeJJ"Bzr Tools and Bazaar GUI needs to be compiled. Use same procedure as for compiling Paramiko."  i fail at finding how to compile Paramiko :P17:58
MikeJJany advice ? :)17:58
lukspython setup.py install?17:58
MikeJJlol, that simple ?  thanks :D17:59
luksI don't really know, just guessing17:59
MikeJJwell, looks like that did it.  thanks again :)18:00
=== kiko-fud is now known as kiko
thekornhi, I've got another bzrlib question: what is the easiest way of getting the 'kind' of an unknown file in a workingtree?18:52
james_wthekorn: osutils.file_kind is what you want I think18:53
arnetheduckjelmer, another question for you - should this be reported as a bug?: "Using saved location: https://dcplusplus.svn.sourceforge.net/svnroot/dcplusplus/dcplusplus/trunk18:53
arnetheduckbzr-svn is not up to date with installed bzr version 1.3.18:53
arnetheduckThere should be a newer version of bzr-svn available.18:53
arnetheduckbzr: ERROR: Transport operation not possible: http does not support mkdir()18:53
arnetheduck"18:53
james_warnetheduck: are you doing push?18:54
arnetheduckjelmer, when pushing a new directory to svn...18:54
arnetheduckjames_w, yes18:54
james_wcan you try "bzr push svn+https://dcplusplus.svn.sourceforge.net/svnroot/dcplusplus/dcplusplus/trunk"18:54
arnetheduckjames_w, I think it may be working since the command is taking a lot longer now =)18:57
arnetheduck(it's a big commit and sf isn't the fastest site on the net18:58
james_warnetheduck: if it works do "bzr push --remember svn+https://dcplusplus.svn.sourceforge.net/svnroot/dcplusplus/dcplusplus/trunk"18:58
thekornjames_w, oh, i'm too much focused on bzrlib that I don't see the obvious18:58
james_wthekorn: no problem18:59
arnetheduckjames_w, that's what I did actually =)18:59
james_warnetheduck: great, your faster than me :-)19:00
abentleyjames_w: I would use Tree.kind, unless trying to get the kind of unversioned files.19:01
jelmerarnetheduck: to push new branches, use "bzr svn-push"19:02
arnetheduckjelmer, it wasn't a new branch, just a new dir in an existing branch...19:02
james_wthekorn: you said "unknown" you meant "unversioned" rather than "arbitrary" didn't you?19:03
arnetheduckjelmer, btw, should I worry about the 1.3 warning?19:03
jelmerarnetheduck: how do you mean?19:03
arnetheduck"bzr-svn is not up to date with installed bzr version 1.3"19:03
jelmerarnetheduck: 0.4.9 is out and supports bzr 1.319:04
thekornthekorn, well, I think i'm a bit confused: I would like to get all files which are in the 'unknown' section when I run 'bzr status'19:05
thekornjames_w, i meant19:05
arnetheduckjelmer, bugger, I checked yesterday I think and it wasn't =)19:05
jelmerarnetheduck: the warning itself isn't really worrysome but you'll find that one or two things give tracebacks19:05
thekornjames_w, and I thought I could get these files with tree.unknowns()19:05
thekornbut this does not work as expected19:06
james_wthekorn: yes, I think that's right, and in that case osutils.file_kind is the correct function to use to get the kind.19:07
james_wwhat do you get that you don't expect?19:07
thekornjames_w, damn I'm always mixing workingtree and revisiontree, sorry, my problem is that list(revtree.unknowns()) always returns an empty list19:10
thekornwhen revtree is an revisiontree object19:10
arnetheduckjelmer, the one I reported the other day? something about some revision number being wrong?19:10
james_wthekorn: I think that's right isn't it?19:11
thekornjames_w, I don't know, have not read any documentations on this, can't revision trees have unknown files?19:13
thekornand if so, why is there a unknowns()-method for RevisionTree-objects?19:14
PengHmm, one project moved its svn repo to Google Code. Does svn consider the repos different and does bzr-svn?19:15
PengHmmm, I think it might have changed significantly.19:17
PengThere are fewer revisions in G Code.19:17
=== mw is now known as mw|food
james_wthekorn: a revisiontree is a committed state, so I think it makes sense for it to have 0 unknowns19:19
james_was to whether the method should be implemented on it I am not too sure.19:19
thekornjames_w, yes this makes sense, thank you19:20
arnetheduckjames_w, here's what I got now: bzr: ERROR: libsvn._core.SubversionException: ("MKCOL of '/svnroot/dcplusplus/!svn/wrk/0dd13b40-b1d2-4fab-9b0e-5fb8b3a13bb3/dcplusplus/trunk': 405 Method Not Allowed (https://dcplusplus.svn.sourceforge.net)", 175002)19:21
james_warnetheduck: I have no idea about that I'm afraid.19:23
abentleyIt's implemented on Tree so that we don't have to special-case other functions depending on their Tree type.19:25
arnetheduckjelmer, how about http://www.pastebin.ca/955617?19:34
jelmerarnetheduck: one sec20:08
=== mw|food is now known as mw
jelmerarnetheduck: doesn't make much sense to me. I don't understand why bzr would be trying to create a directory there20:09
arnetheduckjelmer, it does make sense - svn by default first creates a working folder for the transaction, commits everything there and then moves the transaction to a new revision file...20:18
arnetheduckjelmer, could it be that the digest auth is not being sent (when using pure svn, my credentials are fetched automagically)?20:19
jelmerarnetheduck: that all happens under the hood though - the protocol doesn't include commands like that20:25
jelmerarnetheduck: does "bzr branch <repos-url>" list the branch you're trying to push to?20:27
ubotuNew bug: #127734 in bzr-gtk "Progress bars as widgets" [Medium,Triaged] https://launchpad.net/bugs/12773420:46
=== barry is now known as barry-away
lifelessmoin20:57
abentleylifeless: moin20:58
jelmerhey lifeless, abentley20:58
arnetheduckjelmer, I've successfully committed to the svn branch before, but never with a new directory21:04
jelmerarnetheduck: you added a new directory in your bzr branch and you're now trying to push the revision that added that directory?21:05
arnetheduckjelmer, correct21:14
arnetheduckjelmer, now that I think about it, I first removed a directory and then added one with the same name21:14
arnetheduckjelmer, hm, that makes it two revisions to commit - one that removes a directory (and contents), then another that adds a directory (and contents) with the same name as the one removed21:15
jelmerarnetheduck: that shouldn't be relevant here though21:16
jelmerthe mkdir call you're seeing is about creating a new branch, not about a directory in a branch21:16
arnetheduckjelmer, I'll try again, maybe it was some temporary error21:17
jelmerarnetheduck: I doubt that21:18
jelmerarnetheduck: does "bzr branch <repos-url>" list the branch you're trying to push to?21:18
jelmerarnetheduck: sorry, I mean "bzr branches <repos-url>"21:18
arnetheduckjelmer, running...21:23
* Peng wonders what bzr-svn is doing.21:31
PengAugh!21:32
PengIt took like 2 minutes to pull 1 revision!21:33
jelmerPeng: are you using 0.4.9 ?21:33
Pengjelmer: I'm using yesterday's 0.4 branch.21:34
jelmerPeng: the development branch can have major performance regressions while in flux21:34
PengApparently so.21:34
mathrickhiya21:37
PengHello.21:37
mathrickwhat would be the easiest / best way of serving a writeable public repo with authentication?21:38
Pengmathrick: bzr+ssh?21:39
mathrickPeng: and without ssh?21:40
james_wwebdav?21:40
mathrickokay, I guess ssh is the easier way then21:40
PengYeah.21:41
PengIf it's a FOSS project, you could use Launchpad.21:41
mathrickit's not, not yet anyway21:41
arnetheduckjelmer, it's still stuck...21:45
jelmerarnetheduck: in the "bzr branches.." run?21:46
jelmerit took only a minute or so here..21:46
arnetheduckjelmer, here's what I tried: "bzr branches svn+https://dcplusplus.svn.sourceforge.net/svnroot/dcplusplus/dcplusplus/trunk"21:46
jelmerarnetheduck: please try the repository url21:47
jelmerbzr branches21:47
jelmersvn+https://dcplusplus.svn.sourceforge.net/svnroot/dcplusplus/21:47
spivGood morning.21:57
lifelesshi21:59
mathrickbzrserve@sei.meidokon.net's password:22:24
mathrickServer is too old for fast get_parent_map, reconnecting.  (Upgrade the server to Bazaar 1.2 to avoid this)22:24
mathrickbzrserve@sei.meidokon.net's password:22:24
mathrickwhy does it have to reconnect?22:24
mathrickit makes me input the password twice22:25
james_wmathrick: because the server is too old.22:25
mathrickyeah, but why does it have to reconnect to use the older protocol?22:26
spivmathrick: because the older protocol wasn't designed to allow graceful degradation in the case where a client sends a request with a body but the server doesn't recognise the request22:28
lifelessmathrick: because the old protocol let the server get confused about edge of messages22:28
mathrickaha, not nice of it22:29
lifelessmathrick: so there was no way to be sure when it was actually ready for new input22:29
arnetheduckjelmer,  bzr branches svn+https://dcplusplus.svn.sourceforge.net/svnroot/dcplusplus/ returned nothing22:38
jelmerarnetheduck: what do you have the branching scheme set to?22:41
arnetheduckauto I think, didn't specify anything, and when importing it got my branches right so...22:45
arnetheduckjelmer, sorry, gotta go, I'll check back tomorrow...22:45
jelmerthe fact "bzr branches" returns nothing suggests something may be wrong there22:45
jelmerarnetheduck: what does "bzr svn-branching-scheme <repos-url>" print?22:45
ubotuNew bug: #206242 in bzr-svn "Add append-revisions-only setting for Subversion repositories" [Wishlist,Triaged] https://launchpad.net/bugs/20624222:46
lifelessspiv: looks like only us around; point 2 point call ?22:58
spivlifeless: sure.22:59
igcmorning23:04
evarlastis it possible to branch or export a subdirectory of a repository? maybe this is called NestedTreeSupport ?23:22
Pengevarlast: To turn a subdirectory of a branch into its own branch, see bzr split.23:23
lifelessevarlast: we discussed this in london23:24
lifelessyou can also split as Peng says23:24
lifelessigc: hi, spiv and I just did a p2p call as we couldn't see any others :>23:24
igchi lifeless23:26
spivigc: FWIW, my plan for the day is email + smart impl of set_last_revision_info23:26
igcspiv: thanks23:27
evarlastthank you so much. I searched as searched and could not find split.23:27
igcspiv,lifeless: my plan for the day is ... email + reviews + package the new hook we worked on at PyCon23:28
lifelessigc: I'm working on versionedfiles23:33
ubotuNew bug: #206258 in bzr "incompatible repository error messages are unhelpful" [Undecided,New] https://launchpad.net/bugs/20625823:37
sabdflhi folks23:53
sabdflare 1.3 packages available in the usual ppa? i haven't seen them for hardy yet23:53
sabdfland is there an agreement with the distro team to put 1.3 into hardy itself (not the ppa)?23:54
Pengsabdfl: The PPA takes a few days to update.23:56
PengHey, hg 1.0 is out. :)23:56
sabdflthanks peng, and congrats on the 1.023:57
=== mw is now known as mw|out
PengNot congrats to me.23:58
PengI mean, I'm not one of their developers.23:58
sabdflah, thought you were23:58
PengI'd *like* to be, if I was smart enough. :P23:58
Peng(I'd like to do more than typo fixes on bzr too. I'm not a traitor!)23:59

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