enigma | jelmer: I just added a bug for that AssertError I saw: https://bugs.launchpad.net/bzr-svn/+bug/315666 | 00:04 |
---|---|---|
ubottu | Ubuntu bug 315666 in bzr-svn "AssertError: Empty parent added, but child wasn't added" [Undecided,New] | 00:04 |
kumi | fullermd: but I thought if a standalone tree had all of the revisions stored in .bzr? And when I copied it to the remote server and checked the log, all of the revisions were there... | 00:09 |
kumi | - if | 00:09 |
fullermd | Well, if it was standalone, then yes. | 00:16 |
=== Mario__ is now known as pygi | ||
=== ja1 is now known as jma | ||
=== jma is now known as jam | ||
seb_kuzminsky | hi folks, is there an up-to-date ppa for bzrtools and bzr-svn? | 03:29 |
seb_kuzminsky | i'm on intrepid | 03:29 |
seb_kuzminsky | the bzr ppa has really out-of-date bzrtools packages, and the bzrtools lp project doesnt have its own ppa | 03:30 |
seb_kuzminsky | oh i see, the nightly ppa has bzrtools | 03:30 |
seb_kuzminsky | never mind me... | 03:31 |
seb_kuzminsky | hm, but the bzrtools .deb in the nightly bzr ppa reports version 1.10 (using "bzr plugins"), and then complains it's older than the bzr .deb, which is 1.11rc1: | 03:33 |
seb_kuzminsky | 0 seb@water /home/seb/work/bioserve/bionet2.bzr/subtopic/client/watcher> bzr shelf ls | 03:33 |
seb_kuzminsky | Plugin "Bzrtools" is not up to date with installed Bazaar version 1.11rc1. | 03:33 |
seb_kuzminsky | There should be a newer version of Bzrtools available, e.g. 1.11. | 03:33 |
seb_kuzminsky | Patches on shelf 'default': None | 03:33 |
Leefmc | I think i found a bug.. or workflow problem with bzr.. and would like an explanation of it. If i run a test and pastebin in it, can anyone review my actions? | 04:17 |
Leefmc | http://dpaste.com/107341/ someone please check it out. Its annoying because it wont let me create a new branch and switch to the newly created branch.. | 04:22 |
El_Guille2 | hola | 05:09 |
El_Guille2 | has someone used bazaar for web sites ?? | 05:16 |
verterok | El_Guille2: take a look to the bzr-upload plugin | 05:37 |
El_Guille2 | yeah .. i did xD | 05:38 |
El_Guille2 | it is gonna make my life much easier | 05:39 |
ziroday | Hi, how can you see bzr's progress on branching? | 05:55 |
ziroday | Hi, I keep getting 104 errors when trying to do bzr branch lp:do | 06:39 |
j^ | how does the loggerhead serve-branch --user-dirs option work? | 08:34 |
rysiek|pl | hi guys | 08:53 |
rysiek|pl | I cannot seem to find a definite answer to this: | 08:54 |
rysiek|pl | can a branch hold other branches? or, can a repo hold other repos | 08:55 |
fullermd | Depends on what you mean by "hold". | 09:00 |
fullermd | You can put a branch underneath another branch, and a repo underneath another repo. But that doesn't forge a link between them. | 09:00 |
rysiek|pl | /path/to/repo1/somedir/repo2/branch | 09:00 |
rysiek|pl | so that I could bzr clone /path/to/repo1 | 09:01 |
fullermd | You can't clone a repo in the first place. | 09:01 |
rysiek|pl | AND bzr clone /path/to/repo1/somedir/repo2 | 09:01 |
rysiek|pl | AND bzr clone /path/to/repo1/somedir/repo2/branch | 09:01 |
rysiek|pl | simply put, I need finer-grained control over what can be cloned/checked-out | 09:02 |
fullermd | Certainly you could put a branch underneath another one, and clone either one. But grabbing the outer won't grab the inner; the outer doesn't know anything about it, other than as an unversioned directory inside it. | 09:03 |
rysiek|pl | ah | 09:03 |
fullermd | Eventually, nested tree support will redefine some of that. | 09:03 |
rysiek|pl | well, that defeats the whole purpose of it | 09:03 |
rysiek|pl | thing is, I have a project that uses as it's core another bzr-versioned project | 09:04 |
rysiek|pl | the idea was to have: project-branch/ and project-branch/core | 09:04 |
rysiek|pl | so that changes in project-branch/core can be bzr merged upstream | 09:05 |
rysiek|pl | but bzr clone project-branch gets the whole deal, along with project-branch/core | 09:05 |
rysiek|pl | and... project-branch is only a mere branch inside a wider meta-project's repo | 09:06 |
fullermd | The only way that would work right now would be if you actually merged core into project-branch. And then those revs couldn't be directly merged upstream, they'd have to be cherry picked. | 09:06 |
rysiek|pl | right | 09:06 |
fullermd | What you want there is by-reference nested trees. | 09:06 |
rysiek|pl | I assume something like project-repo/core-branch and project-repo/project-branch | 09:07 |
fullermd | And that's a "someday" feature. | 09:07 |
rysiek|pl | would work as expected? i.e. bzr cloninig project-repo would get me both branches | 09:07 |
fullermd | You can't clone a repo. Only a branch. | 09:07 |
fullermd | Shared repositories aren't semantic units in bzr. | 09:08 |
rysiek|pl | ah | 09:08 |
rysiek|pl | so there would be no single operation on the repo I could perform to get all the branches within? | 09:08 |
fullermd | Not built into bzr, no. | 09:09 |
fullermd | There's no way to ask a repo "what branches do you have"; it doesn't know. | 09:09 |
rysiek|pl | so, what's the point, actually, in creating a repo, instead of a "dumb" directory with branches within? | 09:10 |
fullermd | It saves space and I/O, since you only have one copy of common history. | 09:11 |
fullermd | If you've got two branches that aren't related, of course, you don't save anything. | 09:11 |
rysiek|pl | right | 09:12 |
rysiek|pl | thanks, that got a lot things cleared-up | 09:12 |
fullermd | There's a command 'branches' in bzrtools that looks under a dir and tries to list all the branches there. | 09:12 |
fullermd | But it does it by walking the dir tree and asking each dir "Hi there, are you a branch?" | 09:13 |
fullermd | (works pretty much the same whether you're scanning a repo, a bunch of standalone branches, a dir tree with 5 different repos in it, etc) | 09:14 |
rysiek|pl | I've found a plugin or two that more or less do what I need | 09:14 |
fullermd | There's been talk about a scmproj plugin (or some name like that) lately, which could help. | 09:16 |
rysiek|pl | but come to think about it, those nested trees would be awesome | 09:18 |
fullermd | Yeah. The feature would be perfect, if it were done :) | 09:19 |
fullermd | scmproj (AIUI) gives you something similar, with a little outside help. I could be wrong though; I'm not watching it too closely. | 09:19 |
garyvdm | Hi - Is there a way to check if there is a working tree in a remote location? | 11:18 |
garyvdm | Unfortunately BzrDir.has_workingtree allway raises NotLocalUrl weather there is a working tree or not. | 11:20 |
garyvdm | Note: I do not intend to open the working tree remotely. I'm actual want to check that it is not there. | 11:21 |
=== EarthLion is now known as Ollie| | ||
wekt | Is there a more up to date package source for Debian Lenny? | 12:30 |
maxb | Get packages from experimental and rebuild? | 12:41 |
=== fta_ is now known as fta | ||
=== asac_ is now known as asac | ||
beuno | http://arstechnica.com/news.ars/post/20090107-dvcs-adoption-is-soaring-among-open-source-projects.html | 14:46 |
vadi2 | Hello. Is it possible to see the history of a specific file only, not the whole branch? | 16:51 |
luks | bzr log <file> | 16:52 |
vadi2 | I see, thanks | 16:53 |
gutworth | why does cmd_missing have to lock the branches twice? | 17:13 |
gutworth | it does so in the cmd_missing class and in bzrlib.missing.find_unmerged | 17:13 |
LarstiQ | did it drop the first lock by then? | 17:15 |
gutworth | no | 17:16 |
kumi | related to vadi2's question: is it possible to see the history of a specific file that existed previously, but is deleted in the tip revision? | 17:37 |
Ambro | hello i am a web developer and i am new at version control systems | 17:54 |
Ambro | i am uploading a website, i use bzr-upload plugin and it is working but i have two different files locally and remotely | 17:55 |
Ambro | there is a mysql conection php file lets say conection.php | 17:55 |
Ambro | but they are different .... how should i use bazaar in this case ??? | 17:56 |
luks | I'd suggest to not version them | 17:57 |
luks | version the default configuration in a different file instead | 17:57 |
luks | e.g. config.php.default is versioned, config.php is always local and not versioned | 17:57 |
Ambro | that would be just deleting the files from bazaar right | 17:58 |
Ambro | deleting and keeping them of course ... | 17:58 |
luks | yes | 17:59 |
luks | maybe somebody has a different idea, but this is what works for me | 17:59 |
Ambro | ok thanks i'll try that | 18:02 |
ronny | LarstiQ: any quick idea for running anyvc tests with different bzr versions? | 18:22 |
LarstiQ | ronny: you need to have different versions of bzrlib in the python path | 18:32 |
ronny | hmm | 18:33 |
ronny | i wonder if i can make up a test-rerunner that runs the testsuite once per vcs + version and collects the results | 18:33 |
ronny | combined with a setuptool to set those up | 18:33 |
=== Leefmc is now known as Leefmc-away | ||
Ambro | bzr-upload remembers only one old location and not the last i used | 19:05 |
Ambro | how can i get it to remember a specific location ??? | 19:05 |
Ambro | or maybe i'll just use an alias .. | 19:06 |
james_w | Ambro: bzr upload --remember <location>? | 19:06 |
Ambro | thanks | 19:08 |
Ambro | can i get it to remember the password ?? .. i tried putting it in the remembered location but it asks me for it again | 19:08 |
ronny | LarstiQ: btw, i finally found a way to correctly abstract bzr | 19:20 |
LarstiQ | ronny: oh? | 19:21 |
ronny | LarstiQ: i have 3 basic entities - repo, branch, workdir | 19:22 |
ronny | they will be in arbitar relations from 1:1 up to n:m | 19:22 |
ronny | and they can be located together | 19:22 |
LarstiQ | ronny: heh, that is exactly what the bazaar concepts are too | 19:22 |
LarstiQ | so you're modelling bazaar 1:1 then | 19:23 |
ronny | no | 19:23 |
ronny | branch/workdir relations are different | 19:23 |
LarstiQ | how do they differ? | 19:23 |
ronny | workdirs may not have a single asociated branch | 19:23 |
ronny | in monotone it can be arbitrary | 19:24 |
LarstiQ | ah yes | 19:24 |
LarstiQ | do they need to be tied to 1 repo though? | 19:24 |
LarstiQ | or does that not matter | 19:24 |
ronny | and in git/hg the model of workdir=repo + n branches fits | 19:24 |
lucypher | Hi, is there any way I can keep (777) permissions of a folder? | 19:24 |
* LarstiQ nods at ronny | 19:24 | |
ronny | as for darcs, repo=workdir=branch | 19:25 |
ronny | so its like a standalone bzr branch | 19:25 |
ronny | workdirs/branches will have "tags" they may be movable/fixed and local/distributed | 19:26 |
treeform | hi am having problems doing bzr co on a 512mb server because it taken 100% of memory and swap (about 1.5GB - kernel) | 19:30 |
treeform | is there a way to get around this kind of memory usage? | 19:30 |
treeform | i will try to copy the .bzr part and bzr co from that, i think i did that once and it worked | 19:34 |
=== EarthLion is now known as Ollie| | ||
Peng_ | treeform: What version of bzr? Memory usage tends to get better over time. | 20:14 |
treeform | 1.8 | 20:17 |
=== Guest1132 is now known as Spaz | ||
=== Mario__ is now known as pygi | ||
=== Leefmc-away is now known as Leefmc | ||
=== mark1 is now known as markh | ||
=== asac_ is now known as asac | ||
Jaearess | Does anyone have experience with setting up a Bazaar shared repository with Redmine? When I point Redmine to my Bazaar repository, it tells me "The entry or revision was not found in the repository" and the error "bzr: ERROR: Not a branch: /path/to/my/repository/.bzr/branch/" shows up in my Apache logs. I know Bazaar is working fine because I've had Redmine working with a single branch before. | 23:16 |
luks | maybe it can only work with branches? | 23:17 |
RAOF | Is that error verbatim? If so, it looks like there's a little configuration you need to da :) | 23:17 |
Jaearess | No, it's not verbatim. The path in Redmine is correct, I just took it out of the error message. | 23:19 |
Jaearess | If it's only capable of working with branches, is there a way of doing multiple branches per project (sub-branches or something)? | 23:30 |
Jaearess | Since Redmine will only take one repository per project I mean. If it can only work with a branch, is there a way to work with multiple branches inside that one branch? (So there could be a development branch, stable branch, releases, etc.) | 23:32 |
Peng_ | This sounds like more of a Redmine question. | 23:32 |
Jaearess | Okay, I've tried finding out there and got to response at all, so I was hoping someone here could help. Thanks anyway. | 23:33 |
Jaearess | No repsonse, rather. | 23:33 |
Pete_ | Hello. Can anyone help me get loggerhead to work on apache? I have it running on the localhost:80, but cant get it to work when someone types in : http://bzr.website.com | 23:55 |
Pete_ | To be clear i have gotten it to show up using mod rewrite to force everything to localhost:8080... however, loggerhead seems to screw up and displays links for files as localhost:8080, disregarding the mod rewrite | 23:58 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!