mwhudsonholy cow bzr-svn's "discovering revprop revisions" is slow01:42
meoblast001i need some advice from you version control pros02:31
meoblast001if you guys like to be called that02:31
meoblast001i've been writing a program, it's about 20 commits in, written in C02:31
meoblast001i just finished moving it to C++, would you guys recommend starting a whole new repository or just committing it to the current02:32
PengAre you, like, replacing the C version, or do they both exist at once?02:33
PengAnd...do they share any code at all?02:33
PengI mean, is it a rewrite from scratch, or a conversion?02:33
meoblast001i'm replacing the C version02:33
meoblast001it is a conversion, but i'm assuming >50% of the lines have been changed02:34
meoblast001probably >80%02:34
meoblast001regardless, they share the same concepts and design, just in C++ now02:34
PengUm, I'm about to go to sleep, and I'm honestly not sure.02:34
PengI could go either way. I'd probably keep it in the same branch.02:35
spivWithout thinking about it hard, a) I'd probably just keep using the same repo (after all, why not?), and b) I doubt it matters much anyway.02:35
meoblast001i know this will bloat the repository size a lot02:35
meoblast001but history is good02:35
PengYes, history is good.02:35
Pengmeoblast001: And unless this is a Linux kernel-sized project, relatively large history is still not very much.02:35
PengI mean, who cares if it's 120 KB instead of 70 KB?02:36
spivI say point b) because 20 commits worth of history isn't really going to be that large in the long term so it's not going to bloat much at all, but at the same time hardly anyone is going to care about the first 20 commits in the long term either.02:36
spivHence why I default a), because that's the path of least resistance :)02:37
spiv(It'd be neat to have some way to measure how often old revisions *are* directly accessed...)02:38
meoblast001spiv: since you already know what i'm doing, i have another question for you02:41
meoblast001how would you word this commit02:41
meoblast001"Ported to C++"?02:41
meoblast001i can't think of words that can discribe this02:41
=== keithhub_ is now known as keithhub
spivmeoblast001: sure.  Or "rewrote", or whatever you feel describes the change adequately.02:44
meoblast001spiv: is "port" an appropriate word for changing languages02:44
meoblast001and i didn't completely "rewrite" it02:44
spivAppropriate enough.02:44
spivI don't think commit messages are something to sweat over, especially not in the early days of a project.02:45
spivYou want something that will make some sense to you (or another person) that is looking back at 'bzr log', etc, for some reason.02:45
spivOr at least enough sense that they can say "oh, ok, that's not the revision I'm looking for".02:46
meoblast001yeah, i'm sort of a perfectionist :P02:47
=== keithhub_ is now known as keithhub
meoblast001oh, one of you told me once that you had a hook that a BZR server runs to have an IRC bot alert about commits04:15
meoblast001which of you was it04:15
meoblast001i lost the file04:15
meoblast001if i'm not here when whoever it was sees this, feel free to use memoserv04:15
* shyam trying to get a copy of color-theme project from savannah.. loggerhead seems down at savannah..:(07:26
shyambzr branch http://bzr.savannah.nongnu.org/r/color-theme says "http://bzr.savannah.nongnu.org/r/color-theme/ is permanently redirected to http+urllib://bzr.savannah.gnu.org/r/color-theme/ \n bzr: ERROR: Not a branch: "http+urllib://bzr.savannah.gnu.org/r/color-theme/"07:26
shyamwhat could be the problem?07:27
shyami tried bzr branch sftp://username@bzr.savannah.nongnu.org/srv/bzr/color-theme where username is my savannah username though am not a member of color-theme project. that too said bzr: ERROR: Not a branch: "sftp://swathanthran@bzr.savannah.nongnu.org/srv/bzr/color-theme/".07:30
spivshyam: add 'trunk' to the URL07:35
spivshyam: if you look at it in a web browser there's no .bzr directory there, but there's a trunk directory which does have a .bzr directory07:35
shyamuh! thats the last one thing i didn't do! visit the url in a browser!07:36
shyamspiv: thanks!07:37
spivI just tested, and http://bzr.savannah.nongnu.org/r/color-theme/trunk/ works for me07:37
shyamyeah, now it works here too07:37
shyamis it usual to have a trunk subdirectory?07:39
shyamit looks like for some other projects too..07:39
spivIt's usual to have, or at least allow for, multiple branches for a project.07:40
spivSo the structure of .../proj/branch is pretty common, and 'trunk' is a common name for the primary branch.07:40
shyamoh ok.. but other projects do have a .bzr at bzr.savannah.nongnu.org/r/project-name/07:41
spivDo they have other directories too?07:42
spivA .bzr directory doesn't necessarily mean there's a branch there, it can also be a "shared repository" for the branches inside that directory.07:43
spiv(And the upcoming bzr 2.1 release should give a slightly more informative error if you do attempt to branch from a location that iss a repository and not a branch)07:45
shyamyeah i saw a group of bug lists while scroogling for it..07:46
shyamspiv: what is missing here? how to make it work on bzr.savannah.nongnu.org/r/color-theme ?08:01
=== cjohnston is now known as wikipirate
=== froosch_ is now known as froosch
gerard_how about I just add a "text" parameter to assertFileEqual?14:18
gerard_I really don't care for \r\n most of the time14:19
gerard_I guess I'll leave it until I run into problems on windows14:23
gerard_#&^$*&^@# line endings14:23
=== keithhub__ is now known as keithhub
bialixgerard_: usually in test suite files created with binary flag and LF endings15:06
gerard_bialix: oh good15:06
alefterishi all! I did a bzr pull a file didn't change because of wrong permissions, now I fixed the permissions, but can't get the file up to date, tryed bzr pull and bzr revert without luck15:32
alefterisnevermint, bzr update did the trick15:33
gerard_mmm, test driven development16:24
* gerard_ likes it16:24
justdaveif I have a branched checkout and I move an existing tag, is there a way to get that tag move to go upstream with the push?  It pushes all my revisions, but gives me an error that there's a tag conflict instead of pushing the tag change.17:45
jpdsjustdave: bzr push --overwrite ?17:46
justdavethat works, thanks17:47
justdaveif I try to push and there's been other revisions upstream since I last pulled, will it error that I'm out of sync, attempt to merge, or overwrite the other revisions?17:48
Peng"bzr push --overwrite" overwrites.17:48
justdaveyeah, that's why I was asking.  :)  So I want to be careful not to use that unless I know I have an otherwise up-to-date copy. :)17:48
PengYeah. I'm not sure if there's a (simple) way to just overwrite tags while preserving revisions.17:49
RenatoSilvaif I merge 5 revisions, and use --forget-merges, will I get 5 new revisions in the main level or will them all be compacted as 1 single revision?18:44
RenatoSilvaRenatoSilva: the latter18:47
RenatoSilvaRenatoSilva: oh thanks18:47
lifelessjustdave: Peng: there isn't a 'push tags only' UI at the moment.19:59
PengOther than "scp -p .bzr/branch/tags". O:)19:59
mkanatI wonder if scp works when the shell is bzr serve.20:00
mkanatProbably does, I suppose.20:00
mkanatThere's always hitchhiker, if not.20:00
lifelessscp won't20:01
lifelesssftp will20:01
lifeless(sftp is a subsystem)20:01
lifelessalthough, its possible scp uses the sftp subsystem but I don't think it does20:02
lifelessbesides which, bzr won't work if bzr serve is the shell20:02
gerard_I FINALLY understand the inner workings of bzr update20:46
gerard_it only took two weeks20:46
slestakhi guys, I am trying to use the push_and_update plugin for a new repo based on the BazaarForWebDevs use case.20:53
slestaki am running into the same issue as Sean from the bzr answers page20:53
slestaki have don the initial import and update, however, new pushes are failing20:54
slestaki have tried with --use-existing-dir but that didnt help20:54
slestaknew pushes say: bzr: ERROR: [Error 2] The system cannot find the file specified20:57
slestaki have tried with the cached path, i have tried specifying the path with and without trailing slashes20:58
slestaki have also tried with the plugin installed only locally and also with the plugin installed locally and remotely20:58
chxoh nice, you have a parent_location in branch/branch.conf so nothing mandates a shared repo to be kept under one directory. Nice!21:03
chxis it enough to edit just that one file and then I can move the directory freely?21:05
justdave15:02:16 < lifeless> besides which, bzr won't work if bzr serve is the shell22:17
justdaveours is set up that way and it does.22:17
justdavealthough technically, the shell is a python stub that launches bzr serve22:17
justdaveso whether scp would work would depend on that python stub I suppose22:18
justdaveit's run via ForceCommand in sshd_config, and if you're root it runs bash, and any other user gets bzr serve22:19
RyNy_Hi, I issued a commit command after adding a directory and now Bazaar can't access the lock file for other commands.23:26
RyNy_Get this error: Unable to obtain lock file:///.bzr/branch/lock23:26
RyNy_Any ideas/help? The directory that I added was on LAMP and holds drupal.23:26
RyNy_I'm using Terminal on my Mac to work with Bazaar on my server.23:27
RyNy_The drupal folder that I added is 30MB in size.23:27
PengThe branch is locked? Is bzr still running?23:29
RyNy_I think so. I just broke the lock and tried the same commit and it seems to be hanging again.23:32
PengThat'd explain it, yes. :P23:33
RyNy_Do you know what's going on? Why is it hanging?23:34
RyNy_This is the error I get:23:34
RyNy_bzr commit -m "Added a bunch of modules"23:34
RyNy_Committing to: /23:34
RyNy_added var23:34
PengThat's not an error. :P23:34
RyNy_Is it just processing?23:35
RyNy_How long does it take to add a directory that's 30mb in size?23:35
PengDunno. Not that long.23:35
RyNy_Before I broke the last lock it was running for 2 hours.23:35
PengYeah, not that long...23:36
RyNy_So, something weird is happening?23:36
PengYeah. No idea what, though. Maybe an strace would help? Or various -D options?23:36
RyNy_don't know those commands ...23:37
RyNy_idea: can having 2 .bzrignore files screw things up?23:37
PengBazaar only cares about /.bzrignore. I imagine it completely ignores others.23:37
PengRyNy_: Does .bzr.log contain anything interesting? Sorry, I don't know much about debugging this.23:38
PengRyNy_: What version of bzr?23:38
RyNy_Bazaar 2.0.423:39
RyNy_This is the most recent entry in the log23:42
RyNy_Sat 2010-02-06 23:39:22 +000023:42
RyNy_0.080  bzr arguments: [u'version']23:42
RyNy_0.114  looking for plugins in /root/.bazaar/plugins23:42
RyNy_0.230  looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins23:42
RyNy_0.287  encoding stdout as sys.stdout encoding 'UTF-8'23:42
RyNy_0.425  opening working tree '/'23:42
RyNy_0.472  Traceback (most recent call last):23:42
RyNy_  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 842, in exception_to_return_code23:42
RyNy_    return the_callable(*args, **kwargs)23:42
RyNy_  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1037, in run_bzr23:42
RyNy_    ret = run(*run_argv)23:42
RyNy_  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 654, in run_argv_aliases23:42
RyNy_    return self.run(**all_cmd_args)23:42
RyNy_  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1052, in ignore_pipe23:42
RyNy_    result = func(*args, **kwargs)23:42
RyNy_  File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3510, in run23:42
RyNy_    show_version(to_file=self.outf)23:42
RyNy_  File "/usr/lib/python2.6/dist-packages/bzrlib/version.py", line 42, in show_version23:42
RyNy_    src_revision_id = src_tree.last_revision()23:42
RyNy_  File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree.py", line 1789, in last_revision23:42
PengThat's just from running "bzr version" (and apparently it failed somehow).23:43
RyNy_Sorry, don't understand23:43
PengThat log snippet isn't about the command that failed. It's just from running "bzr version".23:49
RyNy_thanks, running commit again. It's hanging again. Here's the log. Look fine:23:54
RyNy_0.474  preparing to commit23:54
RyNy_[32216] 2010-02-06 23:51:14.878 INFO: Committing to: /23:54
RyNy_0.482  Selecting files for commit with filter None23:54
RyNy_[32216] 2010-02-06 23:51:14.943 INFO: added var23:54
RyNy_Is there a way to "unadd" something from Bazaar23:54
PengRyNy_: bzr rm (which has an argument to not delete stuff), or bzr revert if it hasn't been committed yet.23:55
RyNy_Thanks, so to remove a directory "var"23:58
RyNy_bzr rm var23:58
PengUh-huh. Or "bzr revert var" if it hasn't been committed yet.23:58

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