| a_c_m | humm | 00:36 |
|---|---|---|
| a_c_m | i just tried out bzr-search and i think its corrupted my bzr folder, all operations seem to get stuck at Stage:Indexing...:Saving group 3/4 | 00:37 |
| a_c_m | is there any way to recover? | 00:37 |
| igc | morning | 00:42 |
| a_c_m | morning | 00:43 |
| a_c_m | help :) i've seemed to have corrupted my .bzr folder? i ran a bzr check, which worked fine, but when i bzr up - it hangs at Indexing...:Saving group 3/4 | 00:52 |
| a_c_m | bah | 00:52 |
| a_c_m | was the bzr-search module | 00:53 |
| a_c_m | plugin eevn | 00:53 |
| stefanlsd | Im trying to get a file back which was removed in a commit. Im doing bzr revert -r 14 '80-system-jpeg-png-sqlite.diff' and getting bzr: ERROR: Path(s) are not versioned: 80-system-jpeg-png-sqlite.diff. I've tried full patch to the file also. Am i doing something wrong? | 04:06 |
| * igc bbiab | 04:06 | |
| stefanlsd | *path | 04:07 |
| igc | stefanlsd: that sounds like a bug. Maybe try 'bzr cat -r14 ...'. If that doesn't work, I'd create another branch, and try without the pathname. That should recreate the file and you can copy it from there. Having said that, we really want your use case working so please raise a bug. | 05:01 |
| stefanlsd | igc: ok thanks. i did a bzr revert -r14 and got the file. then a bzr revert and copied the file back in.. but yeah, sounds bug like | 05:03 |
| igc | stefanlsd: cool. The main catch with re-adding the file is that it will get a new internal file-id (which can cause issues with merges crossing the delete/add boundary). I'm pretty sure add has a --with-ids flag (see bzr help add) but it's annoying to have to worry about that. Hence the need for a bug report so we don't forget to fix it! | 05:06 |
| arjenAU | you lost buggerror | 06:57 |
| AntoineLafontain | I have something that is puzzling me. I have a local shared repository with 3 branches into it. There's a main branch, a branch branched from the main called sub and the last branch, branched from sub called project. | 07:56 |
| AntoineLafontain | The idea was to be able to commit changes to each branch and then merge the changes down to sub and then project | 07:57 |
| AntoineLafontain | and if needed create other branches from the sub branch to start other 'projects' like the project branch | 07:57 |
| AntoineLafontain | all this works well on my local setup | 07:57 |
| AntoineLafontain | but I was wondering when I want to push things to share, I can push any branch with no problem, but I couldn't find a way to push a shared repo. | 07:59 |
| AntoineLafontain | I guess it's not possible. And I'm possibly thinking this the wrong way... | 07:59 |
| AntoineLafontain | Any one could give me her/his thoughts on this? Thanks | 08:00 |
| Peng_ | AntoineLafontain: There might be a plugin to make pushing an entire repo easier, but mostly you just push each branch one at a time. | 08:02 |
| AntoineLafontain | and if I branch all the branches to say, another computer, will they keep their relational history... main being the parent of sub and so on? | 08:03 |
| Peng_ | AntoineLafontain: That's only a little bit of meta data; if it's wrong, you can do "bzr pull --remember" (parent) or "bzr push --remember" (push location) to fix it. | 08:13 |
| AntoineLafontain | humm, I think I get most of what you say... Will need toexperiement to "grasp" thing for myself. But thx for confirming that there's a way and nothing wrong with my base setup. | 08:15 |
| Peng_ | AntoineLafontain: What were you referring to? The default "push", "pull", "merge", etc. paths/URLs? | 08:16 |
| AntoineLafontain | well I did all this on my local machine, and using the default merge to propagate changes "down" my branch, using the hierarchy created by branching. | 08:17 |
| AntoineLafontain | but when I considered pushing my setup to my server via sftp... I couldn't figure out how I would keep this relation between my branches... | 08:18 |
| Peng_ | AntoineLafontain: Do you have ssh access to the server? Then you could run "bzr pull --remember", like I said. Or you could manually edit .bzr/branch/branch.conf over ssh or sftp. | 08:19 |
| AntoineLafontain | the --remember option isn't only for remebering the location of the parent branch? | 08:20 |
| AntoineLafontain | sorry, I think my questions are a bit too basic... my experience with bazaar and versioning is quite limited... | 08:21 |
| Peng_ | AntoineLafontain: That is what it's for. | 08:21 |
| AntoineLafontain | okey, so I get this part... | 08:22 |
| AntoineLafontain | humm I guess that my explanation isn't clear... let me try again | 08:22 |
| AntoineLafontain | I made a branch from a remote repo and I called that branch main | 08:22 |
| AntoineLafontain | it is a local branch | 08:22 |
| AntoineLafontain | I've then branched that main branch into a sub branch and made some additions to it... files, folders etc | 08:23 |
| AntoineLafontain | then I made a branch of that sub branch called project | 08:23 |
| AntoineLafontain | from this setup I can update main or sub and then propagate the changes to project as needed | 08:24 |
| AntoineLafontain | using merge | 08:24 |
| AntoineLafontain | this works quite well | 08:24 |
| AntoineLafontain | but if I would like to move this setup on another machine... or share it with a co-worker... | 08:25 |
| Peng_ | OK, so push your branches somewhere. | 08:25 |
| AntoineLafontain | I push all the branches to the server, but if I branch from the branch called sub from the server, the "relation" it had with main is broken | 08:25 |
| Peng_ | What "relation"? | 08:26 |
| AntoineLafontain | eg, if I commit some changes to main | 08:26 |
| AntoineLafontain | I can just move to sub and then do a bzr merge to get all the changes to my sub branch from main | 08:26 |
| AntoineLafontain | I feel I just get some concepts wrong... not that bazaar can't do what I want actualy... | 08:27 |
| Peng_ | You can still merge or whatever you want to. You may have to run "bzr merge --remember /path/to/whatever" to fix up the stored URL once, but that's all. | 08:29 |
| Peng_ | If revisions lost their identities whenever you pushed, DVCSes would be kind of useless. | 08:29 |
| Peng_ | :P | 08:29 |
| Peng_ | Well, they just wouldn't be very "D". | 08:29 |
| AntoineLafontain | haha | 08:29 |
| AntoineLafontain | okey, I think I get it (somewhat). will just get my hands dirty and try it to make sure I do get it | 08:30 |
| AntoineLafontain | thank you for listening to my ramblings ;) | 08:30 |
| Peng_ | :) | 08:31 |
| * igc dinner | 09:14 | |
| adam7 | Is it possible to copy a versioned file from branch A to branch B while retaining the version history? | 10:05 |
| bob2 | I think "copy" is the wrong word | 10:05 |
| bob2 | what are A and B? are they related? | 10:05 |
| adam7 | well, I have A and B, and I'd like to put them in the same branch (currently in seperate branches) | 10:06 |
| adam7 | merge doesn't work because they didn't start from the same branch | 10:07 |
| bob2 | merge can work | 10:08 |
| adam7 | ok... | 10:08 |
| adam7 | I need a flag or something? | 10:08 |
| bob2 | I forget how to use it to merge unrelated branches, sorry | 10:08 |
| adam7 | --weave seems to do it | 10:09 |
| adam7 | oops | 10:09 |
| adam7 | or not | 10:09 |
| bob2 | I think it was -r0.., but I can't seem to find anything on google | 10:10 |
| bob2 | try asking on the list? | 10:10 |
| adam7 | bob2: got it | 10:24 |
| adam7 | bzr merge -r 0..-1 ../other-branch | 10:24 |
| adam7 | then bzr ci --unchanged | 10:24 |
| bob2 | you shouldn't need --unchanged | 10:25 |
| adam7 | I do, for whatever reason... | 10:25 |
| adam7 | otherwise bzr status doesn't work | 10:25 |
| bob2 | eh | 10:25 |
| adam7 | mkdir C | 10:26 |
| adam7 | cd C; bzr init | 10:26 |
| adam7 | bzr merge -r 0..-1 | 10:26 |
| adam7 | +N blah blah blah | 10:27 |
| adam7 | bzr status | 10:27 |
| adam7 | working tree is out of date, run 'bzr update' | 10:27 |
| adam7 | bzr update | 10:27 |
| adam7 | -D blah blah blah | 10:27 |
| adam7 | maybe I'm doing something wrong? | 10:27 |
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| LeonBrussels | I have got a severe problem | 11:26 |
| LeonBrussels | bzr: ERROR: Unknown record type: '\x02' on commit | 11:26 |
| LeonBrussels | is that bad :( ? | 11:26 |
| Odd_Bloke | LeonBrussels: There should be a full traceback in ~/.bzr.log, putting that in a pastebin will help people diagnose the issue. | 11:27 |
| LeonBrussels | Traceback: http://pastebin.com/f468824e6 | 11:31 |
| LeonBrussels | It's not a terribly large or complicated repo | 11:31 |
| LeonBrussels | oh, and my bzr check doesn't look very positive either... | 11:35 |
| Odd_Bloke | Well, I don't know. | 11:37 |
| Odd_Bloke | But someone else who does will show up sometime soon. :) | 11:37 |
| * LeonBrussels has decided he hates bzr | 11:47 | |
| Odd_Bloke | LeonBrussels: :( | 11:56 |
| Odd_Bloke | LeonBrussels: I'm surprised there's no one else around to be able to help, the channel is normally much busier than this. | 11:56 |
| Odd_Bloke | Actually, thinking about it, all the Canonical people are at their annual conference. | 11:57 |
| Odd_Bloke | So that's probably not helping. | 11:57 |
| Ddorda | hey. how do i download a specific revision of a project | 12:20 |
| Peng_ | Ddorda: "bzr branch -r 123 whatever"? | 12:22 |
| Ddorda | so i can do "bzr branch -r 91" and it will download revision 91? | 12:23 |
| Peng_ | Uh-huh. | 12:23 |
| Ddorda | ערקשא | 12:24 |
| Ddorda | great* | 12:24 |
| Ddorda | many thanks :D | 12:25 |
| Peng_ | :) | 12:26 |
| Peng_ | Ddorda: You can also use "bzr revert -r 123" to make the working tree look like it's a certain revision. | 12:27 |
| Ddorda | okay.. thanks | 12:27 |
| === nevans1 is now known as nevans | ||
| === Kissaki^0ff is now known as Kissaki | ||
| Tak | is there a better way of checking whether a branch is bound than get_bound_location? | 15:41 |
| exarkun | Just encountered this failure, http://rafb.net/p/CEC6g533.html | 16:07 |
| servilio | hi! | 16:12 |
| servilio | anyone knows where can I get a bzr-rebase compatible with bzr 1.15rc1? | 16:13 |
| GaryvdM | servilo: lp:bzr-rebase? | 16:14 |
| servilio | GaryvdM: hmmm, will try that... | 16:15 |
| servilio | do you know how stable is it? | 16:15 |
| GaryvdM | I'm running it - have no problems. | 16:17 |
| servilio | GaryvdM: great! are you using bzr 1.15rc1 as well? | 16:17 |
| GaryvdM | no | 16:18 |
| GaryvdM | 1.14.1 | 16:18 |
| ricardokirkner | hi. I am playing with bzr-svn and dpush. I want to have a central bzr repo from which all my developers can branch off, and from which I can pull and push to a central svn repo (upstream). I configured the upstream svn repo to support pre-revprop-change hook in order to rewrite the author, and use dpush in order not to push metadata properties (as they are not wanted in upstream). The main idea here is to use bzr but try not to interfere with upstrea | 16:22 |
| ricardokirkner | m (because normally we can't) | 16:22 |
| ricardokirkner | now, I am getting this strange behaviour: | 16:23 |
| ricardokirkner | I have repo A (from which I dpush), repo B (branch of A) | 16:23 |
| ricardokirkner | when I dpush from A (to svn), and then (in B) pull (from A) | 16:23 |
| ricardokirkner | I get a message that the branches have diverged | 16:23 |
| jelmer | ricardokirkner: yes, that's the disadvantage of dpush | 16:24 |
| jelmer | ricardokirkner: it doesn't retain all of the metadata, and so the revisions change slightly | 16:25 |
| ricardokirkner | jelmer, is there any way around this? (as the branches aren't really different) | 16:26 |
| ricardokirkner | maybe using rebase? some option? | 16:26 |
| ricardokirkner | or, once I dpush I loose any chance to continue my branches? | 16:26 |
| jelmer | ricardokirkner: bzr pull --overwrite in branch B should fix it, or using regular push | 16:26 |
| ricardokirkner | jelmer, alright , I'll try using pull --overwrite | 16:27 |
| jelmer | ricardokirkner: (--overwrite that'll remove any extra revisions you have in branch B) | 16:27 |
| ricardokirkner | as direct push to svn is not what I want (my client has complained that a lot of properties appeared in the svn tree -- as they are using svn 1.4, its file props) | 16:27 |
| jelmer | ricardokirkner: so, one of the things you can do is not pull from branch A until you've dpushed branch A into svn | 16:28 |
| jelmer | ricardokirkner: as the revisions won't change after they have been dpushed | 16:28 |
| ricardokirkner | jelmer, but thats what I've been doing | 16:28 |
| ricardokirkner | that's what made me wonder | 16:28 |
| ricardokirkner | I pushed from B to A , then dpushed from A to svn, then pulled from A to B | 16:29 |
| ricardokirkner | and got the error | 16:29 |
| jelmer | ricardokirkner: yes, because the revisions you pushed from B into A have been rebased by dpush | 16:29 |
| servilio | GaryvdM: to install bzr-rebase local to my account is it enough to copy it under $HOME/.bazaar/plugins? no build necessary? | 16:31 |
| * servilio answers himself: yes, just copying is enough | 16:35 | |
| servilio | though bzr checkout lp:bzr-rebase $HOME/.bazaar/plugins/rebase is even better | 16:35 |
| servilio | jelmer! | 16:36 |
| servilio | jelmer: got 1.15rc1 built and working, thanks again! | 16:36 |
| ricardokirkner | jelmer, and is this not fixable somehow by rebasing B as A was rebased? (without having to overwrite B entirely) | 16:37 |
| jelmer | servilio: np :) | 16:40 |
| jelmer | ricardokirkner: not yet, for that dpush would have to store the information of how things were rebased so rebase could pick it up | 16:40 |
| ricardokirkner | jelmer, and the problem with pull --overwrite is that I can't do anything in branch B until branch A has been dpushed to svn (in order to avoid any diverged message), right? | 16:43 |
| ricardokirkner | so, if developer B pushes to A, and does nothing else on branch B until branch A has been dpushed, and after that pulls with overwrite from branch A , i should not have any issues, right? | 16:44 |
| ricardokirkner | it's a workflow limitation, but it may work | 16:45 |
| jelmer | ricardokirkner: yes | 16:45 |
| jelmer | ricardokirkner: please file a wishlist bug about dpush saving a revid map if that bit seems useful | 16:46 |
| servilio | is it possible to do a rebase from a subversion source? I am trying but get a "different rich-root support" error | 16:48 |
| servilio | should I change the local branch format? | 16:48 |
| SamB | servilio: that sounds unrelated to rebase | 16:48 |
| ricardokirkner | jelmer, if dpush saves a revid map (locally I guess, as I don't want to push any metadata to the svn server), that would allow bzr to rebase branch B accordingly, and prevent the branches to be interpreted as diverged? | 16:48 |
| SamB | servilio: you get that when you to pull, too, don't you ? | 16:49 |
| jelmer | servilio: you need to upgrade the other branch to a rich root format | 16:49 |
| servilio | jelmer: the other branch is a subversion repo | 16:49 |
| jelmer | ricardokirkner: yes, you'd just have to specify the revidmap to dpush (so it can store it) and rebase (so it can load it) | 16:49 |
| * SamB doesn't get the point of dpush | 16:49 | |
| jelmer | servilio: Sorry, I mean your local branch | 16:49 |
| jelmer | SamB: doesn't set any bzr-specific svn data | 16:49 |
| SamB | jelmer: that seems pretty useless to me! | 16:50 |
| jelmer | SamB: some people get annoyed by the file properties bzr-svn sets if you're running against a svn < 1.5 server | 16:50 |
| SamB | I guess if the repository doesn't allow revision properties, maybe it's useful ... | 16:50 |
| ricardokirkner | jelmer, alright.. .I will try pull --overwrite to see if it works for my needs, and file a wishlist for dpush (adding the relevant information for this irc log if you agree) | 16:50 |
| servilio | jelmer: what version should I upgrade it to? I tried bzr upgrade and it says it is already at the newest (I know you can override to an "experimental/devel" format forcibly, but just don't know which one is the right) | 16:50 |
| jelmer | servilio: "bzr upgrade --default-rich-root" | 16:51 |
| SamB | jelmer: do you know anything about why a repository that does allow revision properties would disallow mergeinfo ? | 16:51 |
| jelmer | SamB: yes, mergeinfo was added later | 16:52 |
| SamB | jelmer: does it also depend on something about the repository, in addition to the server ? | 16:53 |
| servilio | jelmer: worked great! thanks! | 16:53 |
| jelmer | SamB: not that I'm aware of | 16:53 |
| SamB | jelmer: hmm, I wonder how sourceforge does this then | 16:53 |
| SamB | since right now the dosemu SVN on sourceforge doesn't allow mergeinfo, but they say that a project admin can upgrade it to do so ... | 16:55 |
| * SamB looks for the ticket ... | 16:56 | |
| SamB | jelmer: ah, here's the ticket where they told me this: https://apps.sourceforge.net/trac/sourceforge/ticket/317 | 16:58 |
| ubottu | Error: <Bugtracker.plugin.Sourceforge instance at 0x293d3b0> bug 317 not found | 16:58 |
| SamB | ubottu: uh, it's definately there! | 16:58 |
| ubottu | Error: I am only a bot, please don't think I'm intelligent :) | 16:58 |
| * SamB was only teasing | 16:58 | |
| SamB | jelmer: can you make anything of that ? | 16:59 |
| jelmer | SamB: that URL requires me to log in | 17:01 |
| SamB | jelmer: it does ? | 17:01 |
| SamB | that's wierd ... | 17:02 |
| jelmer | SamB: ah | 17:02 |
| jelmer | SamB: yeah, there's a format change required too for mergeinfo | 17:02 |
| SamB | jelmer: are you going to write about that on the ticket ... or should I just reopen it and let the sf.net people do that ? | 17:03 |
| jelmer | SamB: I don't see what there is to comment on | 17:04 |
| jelmer | SamB: I mean, what is your question to me exactly? | 17:04 |
| SamB | nevermind, I'll just reopen and see if they can answer ... | 17:04 |
| jelmer | SamB: You'll have to dump and restore the repo as they say in order to use mergeinfo | 17:05 |
| SamB | now, my question for you is: can bzr-svn, after a repository has been upgraded to support mergeinfo, go back and fill that in for bzr merges ? | 17:06 |
| servilio | is svn:ignore supported "full-duplex" in bzr-svn? I can see in workingtree.py that it import it, but aside of the tests, can't see any other reference to svn:ignore in the code | 17:06 |
| dash | SamB: it'll be a new repo, so you'd need a new bzr-svn import i think | 17:07 |
| SamB | dash: wouldn't it just be a new representation of the same repo? | 17:07 |
| jelmer | servilio: no, it's only supported in working trees | 17:07 |
| dash | i don't know what 'representation' and 'same' mean there | 17:07 |
| servilio | jelmer: thx! | 17:08 |
| jelmer | SamB: that's not possible, you can't change the file properties in historic revisions | 17:08 |
| SamB | jelmer: ouch :-( | 17:08 |
| * SamB thinks bzr-svn ought to ask for confirmation before pushing to a repository that won't allow mergeinfo for the first time ... | 17:09 | |
| dash | how would that help? | 17:10 |
| SamB | dash: well, that way you could maybe do something about getting the repository upgraded *first* | 17:10 |
| jelmer | SamB: why? svn doesn't do anything like that either if the repo doesn't support mergeinfo | 17:10 |
| dash | SamB: what's wrong with upgrading it later? just rebranch | 17:11 |
| jelmer | SamB: and svn users benefit from bzr-svn setting svn:mergeinfo, bzr-svn users don't benefit from it (since bzr-svn doesn't look at svn:mergeinfo itself) | 17:11 |
| SamB | jelmer: hmm. | 17:11 |
| SamB | jelmer: is what dash says about having to re-import true? | 17:12 |
| jelmer | SamB: yes, that's the only way you can get bzr-svn to set those svn:mergeinfo properties | 17:12 |
| SamB | jelmer: I mean, after you do the dump/restore, does bzr-svn need to re-import the repository ? | 17:13 |
| jelmer | SamB: depends on if the dump/restore retains the repository UUID | 17:14 |
| jelmer | SamB: You can get it to retain the repository UUID | 17:14 |
| jelmer | SamB: but I think you explicitly have to set the old UUID, otherwise it generates a new one | 17:15 |
| SamB | jelmer: hmm, the help for "load" appears to indicate that if you load into an empty repo, it sets the UUID from the stream ... | 17:15 |
| jelmer | SamB: ah, I might be wrong then | 17:17 |
| === servilio is now known as Guest21385 | ||
| SamB | and I just did a test dump, and "svnadmin dump" seems to dump the repository UUID | 17:18 |
| === servilio_ is now known as servilio | ||
| SamB | jelmer: and are SVN revisions from repositories with different UUIDs considered distinct by bzr-svn ? | 17:19 |
| jelmer | SamB: yes | 17:20 |
| dash | one hopes so | 17:20 |
| * SamB wonders why git-svn doesn't use the UUID instead of the URL | 17:20 | |
| dash | git was written by C programmers | 17:21 |
| SamB | git-svn is in perl though | 17:21 |
| dash | well, perl was written by C programmers too. ;) | 17:21 |
| SamB | so was Python | 17:21 |
| dash | disputable! | 17:22 |
| dash | anyway | 17:22 |
| servilio | isn't pull the command to get a local copy in sync with the remote subversion repository? | 17:22 |
| SamB | are you saying that Python is written by wannabe C coders ? | 17:22 |
| dash | git succeeds because it makes the same optimization tradeoffs as C | 17:22 |
| dash | trading correctness for performance :) | 17:22 |
| SamB | dash: are you talking about "git merge"? | 17:23 |
| dash | servilio: right. it creates a bzr branch containing all the revisions of the remote svn branch | 17:23 |
| * SamB wants a better "git merge" | 17:23 | |
| SamB | servilio: why do you ask? | 17:23 |
| servilio | dash: I already have the local branch, but I need to get it in sync with the repo to be able to push the locally committed changes | 17:23 |
| SamB | it sounds like you just tried it but it didn't work | 17:24 |
| dash | oh, you did say pull, sorry. I did not read what you wrote :) | 17:24 |
| servilio | SamB: I am getting an exception regarding mismatching revisions | 17:24 |
| SamB | servilio: paste it somewhere? | 17:24 |
| SamB | here, if it's short ... | 17:24 |
| servilio | not short, any pastebin at hand? | 17:24 |
| servilio | I know none | 17:25 |
| SamB | !paste | 17:25 |
| ubottu | pastebin is a service to post multiple-lined texts so you don't flood the channel. The Ubuntu pastebin is at http://paste.ubuntu.com (make sure you give us the URL for your paste - see also the channel topic) | 17:25 |
| servilio | SamB: nice :)) | 17:25 |
| SamB | servilio: I had no idea if that would actually work or not ;-) | 17:26 |
| servilio | http://paste.ubuntu.com/176517/ | 17:26 |
| jelmer | servilio: that's a known bug in 0.5.4, fixed in 0.6.0 | 17:27 |
| servilio | jelmer: using 0.6dev | 17:27 |
| servilio | with bzr 1.15rc1 | 17:27 |
| jelmer | servilio: which 0.6dev revision? | 17:28 |
| jelmer | (I fixed that bug yesterday) | 17:28 |
| servilio | how do I see the revision? | 17:29 |
| jelmer | 'bzr revno' | 17:29 |
| servilio | jelmer: 2993 | 17:29 |
| servilio | jelmer: is http://bazaar.launchpad.net/%7Ejelmer/bzr-svn/0.6/ the proper URL to checkout from? | 17:29 |
| jelmer | servilio: no, http://people.samba.org/bzr/jelmer/bzr-svn/0.6 | 17:30 |
| jelmer | 2993 should include the fix though.. | 17:30 |
| * servilio goes to switch to the new URL actually checking out to plugins dir directly... | 17:30 | |
| servilio | jelmer: @2997 now, trying again... | 17:32 |
| servilio | jelmer: same result | 17:32 |
| servilio | jelmer: want me to gather some more data beyond the traceback? run it in verbose mode? | 17:32 |
| jelmer | servilio: please file a bug | 17:32 |
| jelmer | servilio: is this a public repo? | 17:33 |
| servilio | jelmer: no, local to the university I work | 17:33 |
| servilio | but I have full access to that machine, could get some data on the repo | 17:33 |
| servilio | maybe it is still in old format or something | 17:33 |
| jelmer | no, that shouldn't be relevant. this very much looks like a bzr-svn bug | 17:34 |
| SamB | servilio: is it local for a particular reason? | 17:34 |
| servilio | SamB: for most of the code, just lack of time to move it out | 17:35 |
| servilio | some other code is quite local to us | 17:36 |
| SamB | servilio: as in, private ? | 17:36 |
| servilio | though publishing it wouldn't do any harm | 17:36 |
| servilio | SamB: as in only accessible from campus network | 17:36 |
| SamB | ah, so as in, you don't think anyone else would want it ? | 17:36 |
| servilio | SamB: at the beginning, yes | 17:37 |
| SamB | so you could probably get permission to give jelmer a copy of the repository, then ? | 17:37 |
| servilio | SamB: started with branding stuff, then just put there stuff that might have lived outside | 17:37 |
| servilio | SamB: yes | 17:38 |
| servilio | I can give it a try | 17:38 |
| servilio | don't expect any trouble getting the OK from the stakeholders | 17:38 |
| jelmer | servilio: Perhaps wait until that's really necessary | 17:39 |
| servilio | jelmer: OK | 17:39 |
| servilio | jelmer: should I file a new bug or put the new data under an existing one? | 17:39 |
| SamB | jelmer: well, he seems to think it'd be mostly a matter of asking ... | 17:39 |
| jelmer | servilio: new bug please | 17:39 |
| jelmer | SamB: yes, but I was mainly asking so I can have a quick try to see if I can reproduce + fix it | 17:40 |
| servilio | jelmer: I think I know what is happening | 17:40 |
| SamB | whatever ;-) | 17:40 |
| * servilio goes to do a short test... | 17:41 | |
| SamB | I just thought I'd ask about it, since I know people at universities often keep stuff private merely because they haven't bothered to make it public ... | 17:42 |
| servilio | hmmm, there is really a mismatch | 17:45 |
| jelmer | servilio: can you tell what it's doing wrong based on "svn log -v" ? | 17:45 |
| servilio | the files at the svn repo are at revision 362, but somehow bzr-svn got its metadata at 387 | 17:46 |
| jelmer | servilio: is 387 mentioned anywhere in log? | 17:46 |
| jelmer | servilio: is that particular path changed in 387 ? | 17:46 |
| servilio | jelmer: will see, svn repo is at 427 | 17:46 |
| servilio | yes, I think I found the cause | 17:47 |
| servilio | I changed the base URL of the repo | 17:48 |
| servilio | it happened at revision 387 | 17:48 |
| servilio | :) | 17:48 |
| jelmer | servilio: can you please mention this in the bug report ? | 17:48 |
| servilio | yep | 17:48 |
| jelmer | servilio: Possible with the changes as printed by "svn log -v" from that revno | 17:48 |
| servilio | jelmer: no problem | 17:48 |
| servilio | jelmer: what about doing a bzr switch on the local bzr branch? | 17:49 |
| servilio | could it fix this? | 17:49 |
| jelmer | servilio: no, this really is a bzr-svn bug | 17:50 |
| servilio | ok | 17:50 |
| servilio | filing new bug... | 17:50 |
| servilio | jelmer: what about rebase? shouldn't that make the local branch sync with the remote svn? (just curious) | 17:55 |
| === nevans1 is now known as nevans | ||
| jelmer | servilio: rebase basically replays your local commits on top of the remote ones | 17:56 |
| jelmer | servilio: the extra revisions you have locally I mean | 17:56 |
| servilio | jelmer: rebase just says: "No revisions to rebase." | 17:57 |
| jelmer | servilio: if you don't have any extra revisions locally, that's correct | 17:57 |
| servilio | jelmer: what is better: paste the outputs directly or attached as files? | 18:05 |
| jelmer | servilio: paste directly please | 18:07 |
| servilio | ok | 18:07 |
| servilio | jelmer: just to confirm: I am including the output from svn log and bzr pull; am I leaving anything out? | 18:12 |
| jelmer | servilio: "svn log -v" ? | 18:19 |
| jelmer | servilio: other than that, that should be sufficient | 18:19 |
| servilio | ok | 18:19 |
| servilio | jelmer: is it possible to use markup in the bug information area? | 18:42 |
| jelmer | servilio: don't know | 18:43 |
| ricardokirkner | is there a way to have a bzr smart server with authentication and allow writes, that doesn't expose the full filesystem path? (like bzr+ssh does) | 18:46 |
| LarstiQ | ricardokirkner: ClueBzr? | 18:47 |
| ricardokirkner | is it stable enough? (I just saw a mention of it recently) have you any experience using it? | 18:47 |
| LarstiQ | no idea, no. | 18:48 |
| LarstiQ | ricardokirkner: barring Launchpad, it's the only server implementation I know that does that. | 18:49 |
| ricardokirkner | LarstiQ: alright, I will take a look at it, thanks | 18:49 |
| mib_thk4aclq | I'm having some permissions issues in bzr on a Linux box | 19:01 |
| mib_thk4aclq | Anyone with any knowledge of this? | 19:02 |
| LarstiQ | mib_thk4aclq: not enough information given to know yet. | 19:02 |
| mib_thk4aclq | Here goes. | 19:02 |
| mib_thk4aclq | I have a project that several users on the local box use | 19:02 |
| mib_thk4aclq | I'd like all to have commit privileges from their local branches to the main branch. | 19:02 |
| mib_thk4aclq | However, every time I run a push to merge my local branch with the main branch, ownership is set to me alone. | 19:03 |
| mib_thk4aclq | None of the other devs are able to make commits. | 19:03 |
| mib_thk4aclq | I'd rather not have to change permissions on the main branch location each time. | 19:03 |
| mib_thk4aclq | Is there a better way to set it up, to avoid this issue? | 19:03 |
| LarstiQ | mib_thk4aclq: yes, I personally make use of posix acls | 19:04 |
| mib_thk4aclq | To what end? | 19:04 |
| LarstiQ | mib_thk4aclq: to set the permissions on /srv/bzr | 19:05 |
| mib_thk4aclq | I see. That seems reasonable. I'm rather surprised bzr isn't able to handle this on its own. | 19:06 |
| mib_thk4aclq | I expected this scenario would be fairly common. | 19:06 |
| LarstiQ | mib_thk4aclq: something like `setfacl -m group:bzr:rwx /srv/bzr/*' | 19:06 |
| LarstiQ | mib_thk4aclq: bzr is not in the business of handling permissions | 19:07 |
| mib_thk4aclq | I suppose that keeps everything nice and general, given its portability. | 19:07 |
| mib_thk4aclq | Many thanks. | 19:07 |
| LarstiQ | mib_thk4aclq: alternatively, if you're using a smartserver instead of dumb transports, you could handle it there | 19:07 |
| mib_thk4aclq | Oh? Could you direct me to the proper documentation? I investigated the smartserver but couldn't find relevant info. | 19:08 |
| LarstiQ | mib_thk4aclq: http://pypi.python.org/pypi/ClueBzrServer/0.2 or with Apache + mod_auth | 19:08 |
| dash | LarstiQ: probably you can't use that if all the urls are file:// ones :) | 19:08 |
| LarstiQ | dash: correct :) | 19:09 |
| mib_thk4aclq | Well, using a smartserver or dumb transport makes no difference to me | 19:09 |
| mib_thk4aclq | All users are local | 19:09 |
| LarstiQ | mib_thk4aclq: if they use file:// urls, it is purely a filesystem permissions situation. | 19:10 |
| LarstiQ | for which I recommend setfacl for more flexibility than traditional Unix permissions | 19:10 |
| mib_thk4aclq | Well, I'd prefer to do the configuration with the smartserver then. | 19:10 |
| mib_thk4aclq | Which I think I shall | 19:10 |
| mib_thk4aclq | I'm just sick of having the other devs pissed at me for blocking commits | 19:11 |
| mib_thk4aclq | :/ | 19:11 |
| LarstiQ | mib_thk4aclq: you can get partway to where you want to be with the setgid bit | 19:12 |
| mib_thk4aclq | Mhmm | 19:12 |
| LarstiQ | but that falls short in the area of new directories mainly | 19:13 |
| LarstiQ | $ setfacl -m group:developer:rwx /bzr | 19:13 |
| LarstiQ | $ setfacl -m default:group:developer:rwx /bzr | 19:13 |
| LarstiQ | takes care of all that | 19:13 |
| LarstiQ | mib_thk4aclq: I've set it up once on the server, and never look back | 19:13 |
| mib_thk4aclq | Well, there's certainly no harm in trying it out, since the box is locked down tight | 19:14 |
| jelmer | servilio: did you manage to file the bug? | 20:00 |
| servilio | jelmer: I am trying to reproduce the bug locally, but can't get bzr to make the first commit before removing an element from the path | 20:00 |
| servilio | I think I'll file the bug and later try to reproduce it | 20:01 |
| servilio | also because I need to find a way to put my changes into the subversion repository (I mean, the ones from the real work, not the mock situation trying to reproduce the bug) | 20:02 |
| servilio | jelmer: I am getting a "Not a branch" when checking out a local svn repo: http://paste.ubuntu.com/176633/ | 20:20 |
| jelmer | servilio: yeah, because the branch you're checking out is not a branch according to the layout you're specifying | 20:21 |
| jelmer | servilio: it seems like you'd want to create l1/l2/trunk | 20:22 |
| servilio | so, what should I do to have just a directory? | 20:23 |
| jelmer | servilio: how do you mean? | 20:23 |
| servilio | I tried bzr branch like you suggested here: http://www.nabble.com/My-experience-with-bzr-svn-td23606249.html | 20:23 |
| servilio | but svn+file is not a recognized protocol | 20:23 |
| jelmer | servilio: file:/// should work | 20:24 |
| servilio | will try that... | 20:24 |
| jelmer | servilio: I think I see what the problem is | 20:25 |
| jelmer | anyway, time for groceries first, back later | 20:26 |
| servilio | jelmer: got the branch properly created, now doing some local changes... | 20:26 |
| servilio | see you later | 20:26 |
| jelmer | servilio: if you end up with a script that can reproduce this, that would be very useful (for the regression testsutie in bzr-svn) | 20:27 |
| servilio | jelmer: yep, I know | 20:27 |
| servilio | jelmer: got it :) | 21:01 |
| jelmer | servilio: w00t :-) | 21:13 |
| servilio | found that it only happens with three levels of nesting | 21:14 |
| servilio | two doesn't show up | 21:14 |
| servilio | and bzr missing misses the changes in the remote svn repo on the 3 nesting case | 21:15 |
| jelmer | interesting | 21:15 |
| servilio | I am extending the script to automate the testing for different levels | 21:15 |
| servilio | I'd like to see what happens at 4 levels | 21:18 |
| jelmer | servilio: can you attach the script to the bug report? | 21:33 |
| servilio | I'll do it | 21:33 |
| servilio | I am finishing it, will test it in a minute | 21:33 |
| servilio | jelmer: ready, attaching it now to ticket... | 21:58 |
| servilio | done | 22:01 |
| servilio | jelmer: is there a way I can push the changes I have in my local branch to the svn repo #378799 notwithstanding? | 22:03 |
| === krisfree is now known as krisfremen | ||
| === Kissaki is now known as Kissaki^0ff | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!