| james_w | rexbron: I return home tomorrow, I'll try and get to it soon | 00:18 |
|---|---|---|
| === edcrypt_ is now known as edcrypt | ||
| smoothice | Hello... I'm getting a bzr-svn exception when I run any bazaar command. The only way around it is by running it with --no-plugins. I know some bug reports were submitted to Launchpad but they were reported to be fixed in previous versions. I'm having these problems with version 1.10. | 02:39 |
| jelmer | smoothice: what's the exact backtrace? | 02:40 |
| smoothice | Would you like me to pastebin? | 02:40 |
| jelmer | please do | 02:40 |
| smoothice | jelmer: http://pastebin.com/ma0212ae | 02:42 |
| jelmer | smoothice, are you on Windows? | 02:43 |
| smoothice | jelmer: No... Mac OS X 10.5.5 | 02:43 |
| jelmer | smoothice, what version of bzr-svn are you running? | 02:43 |
| smoothice | jelmer: 0.4.16 | 02:43 |
| jelmer | smoothice, What URL is the repository at exactly? | 02:44 |
| smoothice | jelmer: The repo has since been deleted... What is weird is that I've never used bzr-svn. I've been using SVN recently but not bzr-svn. | 02:45 |
| smoothice | jelmer: So this has become a surprise when this began happening today. | 02:45 |
| jelmer | smoothice: It's occuring because you have bzr-svn installed | 02:46 |
| jelmer | smoothice, So it's expected that that operation fails, you're just surprised by how it fails? | 02:46 |
| smoothice | jelmer: I'm surprised that it just starting happening today since I've never used bzr-svn. | 02:47 |
| smoothice | jelmer: started* | 02:47 |
| smoothice | jelmer: Any ideas? It just seems strangely random that it just started today... I upgraded to bzr 1.10 last night... | 02:50 |
| jelmer | smoothice: Has anything else changed? | 02:52 |
| jelmer | smoothice, So it's expected that that operation fails, you're just surprised by how it fails? | 02:52 |
| smoothice | jelmer: I'm surprised _anything_ fails... I've never even used bzr-svn... | 02:53 |
| jelmer | smoothice: That doesn't matter - if you have bzr-svn installed, bzr will try to open a locatioin with bzr-svn if the other means to open it fail | 02:55 |
| jelmer | that's why you're seeing this particular error | 02:55 |
| jelmer | What happens if you use --no-plugins? Does it give a different error? | 02:55 |
| smoothice | jelmer: I never installed bzr-svn... is it installed by default? | 02:55 |
| jelmer | smoothice, probably | 02:56 |
| smoothice | jelmer: ok. should I uninstall it? and if so how would I go about doing that? | 02:56 |
| jelmer | smootice: What happens if you use --no-plugins? Does it give a different error? | 02:56 |
| smoothice | When I run bzr whoami with --no-plugins it runs successfully. | 02:57 |
| jelmer | smoothice: But when you run the exact same command that previously failed with --no-plugins ? | 02:57 |
| smoothice | jelmer: it works | 02:57 |
| jelmer | smoothice, what command is that exactly? | 02:57 |
| smoothice | jelmer: everything.. but I've been using whoami as a test | 02:58 |
| jelmer | smoothice, does a .svn directory exist in the current directory | 02:58 |
| smoothice | jelmer: Yes | 02:59 |
| jelmer | smoothice, that explains why bzr-svn enters the game | 02:59 |
| smoothice | jelmer: oh.... | 02:59 |
| smoothice | jelmer: that explains why it sometimes works and sometimes doesn't depending on the directory I'm in... So the solution is to rm that .svn directory? | 03:00 |
| jelmer | smoothice: probably, yeah | 03:00 |
| smoothice | jelmer: The thing is that I'm never going to need to use bzr-svn.. because I either use one or the other. Is there a way I can deactivate or uninstall bzr-svn? | 03:01 |
| jelmer | smoothice, but will you ever need to use svn and bzr in the same directory? | 03:01 |
| smoothice | jelmer: Not really... Any given project will either be svn or bzr... not both | 03:02 |
| jelmer | smoothice, in that case I would just recommend removing whatever of the two you didn't need in this case | 03:03 |
| jelmer | you can always disable bzr-svn using the --no-plugins argument | 03:03 |
| smoothice | ok | 03:03 |
| smoothice | jelmer: any way to pass noplugins automaitcally? or make it default? | 03:04 |
| jelmer | smoothice: well, the problem here really is that either) | 03:09 |
| jelmer | * there is a bug in bzr-svn when opening certain URLs | 03:09 |
| jelmer | * you have a .svn directory laying around that points to an invalid Subversion repository URL | 03:09 |
| smoothice | ok | 03:11 |
| jelmer | smoothice: Do you have enough information to tell that either is the case? | 03:14 |
| smoothice | jelmer: I think the combination of it all gave me bad luck... 1. old .svn dir 2. old url 3. bug | 03:15 |
| paroneayea | hello | 04:47 |
| paroneayea | so, I'm looking into bazaar | 04:47 |
| paroneayea | it's interesting.. I'm currently a git user | 04:48 |
| paroneayea | the one thing that seems to bother me is what seems to be a hardcoded link to launchpad | 04:48 |
| paroneayea | which, it's great that launchpad helps support hosting free software projects like this | 04:48 |
| paroneayea | but my wariness of gatekeepers kind of blips | 04:49 |
| paroneayea | wondering if I'm missing something | 04:49 |
| Peng_ | What do you mean? | 04:53 |
| Peng_ | You don't *have* to use Launchpad. | 04:53 |
| paroneayea | right | 04:53 |
| paroneayea | just wondering.. there's builtin conveniences that encourage launchpad use. Wondering if there's a way to decentralize them | 04:53 |
| paroneayea | er | 04:54 |
| paroneayea | :\ | 04:54 |
| paroneayea | hm. | 04:54 |
| Peng_ | What? | 04:54 |
| paroneayea | never mind :) | 04:55 |
| abentley | paroneayea: The hardcoded links to launchpad are provided via a plugin. They are not a core part of the program. | 05:24 |
| paroneayea | abentley: aha. thanks. | 05:31 |
| Peng_ | Even if you don't like Launchpad, there's no real reason to remove the plugin though. | 05:36 |
| bewst | Trying to get used to this bzr thing... | 07:06 |
| bewst | so I do a bunch of commits to my local repo... that already makes me nervous because I don't have everything I've done backed up on the server... | 07:07 |
| bewst | and then I bzr push the changes out (to my svn repo). At that point I'd like to add an SVN checkin comment that closes the Trac ticket I've been working on. Is there a way? | 07:08 |
| maco | bzr says i have uncommitted changes. i'm pretty sure i havent changed it since my last "bzr pull" ...is a pull considered an uncommitted change? | 07:45 |
| AfC | maco: no, it isn't | 07:57 |
| maco | is there a way to see what the uncommmitted changes are? | 07:57 |
| cammoblammo | maco: bzr status or bzr diff (if you want to see the details) | 08:03 |
| maco | er...i dont understand how to read bzr status's output | 08:04 |
| cammoblammo | It'll give you a list of files that have been modified, added, removed, and so on. If there are some surprises in there you can use bzr diff to see the details. That can be a little trickier to understand. | 08:06 |
| cammoblammo | What exactly don't you understand? | 08:06 |
| AfC | maco: `bzr status` and `bzr diff` are fairly fundamental, so it's a bit of a puzzle that you would be seeing something there that you don't understand [unless we are wildly misinterpreting your situation] | 08:07 |
| maco | well all ive ever used of bzr are pull and commit...so... | 08:09 |
| maco | but its listing like 200 files | 08:09 |
| maco | and i'm 99% sure i havent changed even 1 file, let alone 200 | 08:09 |
| AfC | A not yet committed merge possibly (though that should be evident), or you did a `bzr uncommit` somewhere along the way and haven't done a matching `bzr revert` to get rid of the changes. | 08:10 |
| AfC | (though why you are committing if you are only pulling is quite beyond me) | 08:10 |
| maco | oh ok yes i did do a merge because pull gave errors | 08:11 |
| cammoblammo | Are you syncing between different operating systems or file systems? I had a similar thing once---turned out it was line endings being changed. | 08:11 |
| maco | so i have to commit after merge? | 08:11 |
| maco | im sorry, im very newbie at vcs :( | 08:11 |
| cammoblammo | Yes, because if you're mergng your changing the files that are coming to you. You're making hybrid files, so to speak. They're different to the ones originally on your machine, and they're different to the ones on the other machine. | 08:15 |
| maco | oh | 08:15 |
| maco | wait, will they have the <<<<<<<<<<<<<<<< and >>>>>>>>>>>>> lines in them then? | 08:16 |
| bob2 | if you made changes in the same places as the other people did | 08:16 |
| bob2 | then you need to resolve the conflict (ie pick a side or combine both sides) | 08:16 |
| maco | and if i didnt make changes then i can just tell it to commit? | 08:17 |
| cammoblammo | Presumably. My usage style leads to very little merging, so I'm always a little paranoid. You can check what changes were made with bzr diff, but for 200 files that could be a little tedious! | 08:20 |
| maco | eh none of them were the one file i was working on | 08:20 |
| maco | so ok thanks | 08:20 |
| maco | so if i do pull more often, can i avoid merging? | 08:21 |
| cammoblammo | If you pull before you start working on a file you'll minimise the chance you'll need to merge. Of course, if somebody else commits just before you do you might have to do a merge. | 08:24 |
| cammoblammo | Committing frequently will also help. Make someone else merge instead! | 08:24 |
| maco | why did i have to merge to begin with if i didnt edit all those files? | 08:25 |
| maco | i branched a while ago, edited 1 file, and then didnt touch anything for a month | 08:25 |
| maco | er, i committed after that 1 file | 08:25 |
| fullermd | Erm. It's not a matter of 'how often'. You can only pull as long as you don't diverge. | 08:26 |
| cammoblammo | Are you on Windows while others are using UNIX like OSes? | 08:26 |
| fullermd | Uncommitted changes aren't technically divergance, but leaving them around while you pull is kinda skating on the edge. | 08:27 |
| maco | cammoblammo: no, i'm on ubuntu and it's a gnome project, so i'd guess they're all on linux too | 08:30 |
| cammoblammo | Have you tried bzr diff? Even if the output's a little difficult to parse, you might get a clue as to what's going on. | 08:33 |
| maco | oo...um well i committed the merge now, but why does bzr log show rev 9726 and 9728 with no 9727? | 08:35 |
| * fullermd is fairly certain it doesn't. | 08:42 | |
| maco | oh. heh, youre right. ok im just confused by the order it puts things. i'll go away now since bzr's not yelling at me anymore | 08:44 |
| Kosjer | good morning | 09:28 |
| Kosjer | got an odd and probably simple problem maybe someone could give an advice :) | 09:28 |
| Kosjer | i am using bazaar 1.10 on osx. i am playing around a little at the moment to get used to. created a directory with 2 sml textfiles in a working directory and entered the directory into bazaar. changed files a little in text editor and always commited afterwards. then i tried out revert and uncommit. and there the odd thing starts. i added to one of the files the word "test" and commited. basically test should vanish after revert and u | 09:33 |
| bob2 | Kosjer: you got cut off after "after revert and " | 10:24 |
| Kosjer | basically test should vanish after revert and uncommit. but strange part is if i use bzr uncommit the last log commit entry gots deleted. but the content of the text file remains with test. if i use bzr rever the test word vanishes. but aside file called TM98 Kopie.sml.~1~ appears in the work directory aside the original TM98 Kopie.sml. Is the behaviour of uncommit and revert regular? | 10:24 |
| Kosjer | thanks ;)) | 10:24 |
| bob2 | bzr uncommit will revert to the the "add" of the files | 10:26 |
| Kosjer | the file got just altered. ii had state 1 then added a word to it and commited to state 2. so i thought with uncommit. i get state1 back | 10:26 |
| fullermd | uncommit doesn't affect the working tree; it just pops the branch back to the state prior to commit. | 10:36 |
| fullermd | revert [with no args] pops the working tree back to the state of the head of the branch. | 10:36 |
| Kosjer | ahh so uncommit only affects the log. revert the files itself | 10:49 |
| Kosjer | thanks fuller! | 10:49 |
| fullermd | Similarly, you could say 'bzr revert -r-50', and that would change all the files back to the way they were 50 revs ago. | 10:50 |
| fullermd | But the branch itself wouldn't be changed; those 50 revs you reverted past are still there; only the files in your working tree are moved around. | 10:50 |
| Kosjer | ahhh oki | 10:50 |
| fullermd | Think of it in terms of which commands affect the branch, and which affect the working tree, and it's reasonably easy to keep straight. | 10:50 |
| fullermd | (and which affect the repository, but those are mostly implicit in affecting the branch) | 10:50 |
| Kosjer | oki | 10:51 |
| Kosjer | cool | 10:51 |
| Kosjer | will play around a little more today. thanks a lot! | 10:52 |
| === mario__ is now known as pygi | ||
| === asac_ is now known as asac | ||
| === fta_ is now known as fta | ||
| === Hydrogen_ is now known as Hydrogen | ||
| eferraiuolo | I was looking for some help when using BZR with SVN | 19:15 |
| eferraiuolo | For every operation I'm asked for my password on the SVN server | 19:15 |
| eferraiuolo | I am connecting to it via HTTPS so I figure it's using Web-Dav | 19:15 |
| eferraiuolo | How can I make things where I don't have to authenticate every single operation? | 19:16 |
| eferraiuolo | If anyone has a way to help me with this, that would be great if you emailed me at: eferraiuolo@gmail.com | 19:37 |
| a_c_m | whoops, i just did a bzr revert when i really didnt want to... is there anyway to get back the now gone changes? | 21:10 |
| beuno | a_c_m, I believe that bzr saves the previous files as filename~ | 21:12 |
| beuno | do an ls -a | 21:12 |
| a_c_m | beuno: not this time... crap, luckly i think i have it cached in my browser :) i love firebug!! (it was a css file) so i'm just loosing comments | 21:14 |
| beuno | a_c_m, how odd, it's suppose to do that everytime AFAIK | 21:15 |
| === jokaro is now known as jokaro_ | ||
| === jokaro_ is now known as jokaro | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!