| CameronP | Hi guys - is vila around? | 01:17 |
|---|---|---|
| lifeless | CameronP: not for 5 or 6 hours | 01:36 |
| CameronP | lifeless: Thanks.. | 01:36 |
| CameronP | Does anyone know how to "uninstall" bzr - I think my installing from source has broken on x64 centos | 01:50 |
| CameronP | python setup.py xxxx? etc? | 01:50 |
| CameronP | I just deleted the bzrlib dir from lib64 and this seemed to do the trick | 01:54 |
| CameronP | however the install doesnt seem to work for x64 on centos | 01:54 |
| lifeless | CameronP: can you file a bug please? | 01:57 |
| lifeless | CameronP: uninstalling - setup.py doesn't offer uninstall ><> | 01:57 |
| lifeless | CameronP: you might like to use the rpm spec file and build a package rather than installing directly. | 01:57 |
| CameronP | yeah ill just run from source | 01:57 |
| CameronP | it should be ok | 01:57 |
| lifeless | setup.py build_ext -i | 01:58 |
| lifeless | will build the extensions for you for that | 01:58 |
| lifeless | we'd like a bug though, if install isn't working, so we can document/fix it | 01:58 |
| CameronP | yeah sure will file it | 01:59 |
| ub3rst4r | hi, i am trying to merge the 1.4 source code with the 1.3.4 source code but when i go to merge it says "nothing to do" and then when i try to push it says "ERROR: These branches have diverged. Try using "merge" and then "push"." what do i do? | 02:09 |
| james_w | ub3rst4r: hi, are you just running "bzr merge"? | 02:09 |
| ub3rst4r | ya | 02:09 |
| james_w | it is probably merging from a different branch than you are pushing to | 02:10 |
| james_w | "bzr merge :push" will merge from the branch that it tries to push to | 02:12 |
| ub3rst4r | 31 conflicts encountered. what does that mean? | 02:15 |
| james_w | ub3rst4r: http://doc.bazaar-vcs.org/current/en/user-guide/index.html#merging-changes | 02:18 |
| ub3rst4r | wtf? | 02:29 |
| ub3rst4r | now theres two different branches | 02:30 |
| CameronP | do any of you guys use the upload plugin? | 02:43 |
| CameronP | does anyone know how to change the text editor in bazaar explorer? | 03:17 |
| ub3rst4r | wtf! | 03:31 |
| ub3rst4r | why cant i get this branch to merge | 03:31 |
| CameronP | having probs eh | 03:31 |
| CameronP | me 3 | 03:31 |
| ub3rst4r | i think i got it now | 03:37 |
| CameronP | Using bazaar explorer for version 2.0 on windows vista seems to break - cant ssl in at at all :( | 03:45 |
| CameronP | all working fine, jsut user error | 04:09 |
| meoblast001 | i was just looking through some of my commits | 05:22 |
| meoblast001 | is it typical for someone to have their bazaar "email" field set to their real emal? | 05:23 |
| meoblast001 | email* | 05:23 |
| === Adys_ is now known as Adys | ||
| Peng_ | meoblast001: What else would you use? | 05:27 |
| meoblast001 | idk | 05:28 |
| meoblast001 | i just noticed my commits said "meoblast@aol.com" and thought "was it always that way?" | 05:28 |
| meoblast001 | figured out it was | 05:28 |
| meoblast001 | so i thought i'd inquire if that was the norm | 05:28 |
| CameronP | Just started with bazaar explorer, and wondering if someone can explain something to me - Up until now I've been using the centralised model | 05:40 |
| CameronP | with checkouts and commits | 05:40 |
| CameronP | to the server repository | 05:41 |
| CameronP | in bazaar explorer, when i try and do an update, first | 05:41 |
| CameronP | it seems to only do a local update, and doesnt pull it down from the server | 05:41 |
| CameronP | does that make sense? | 05:41 |
| Peng_ | CameronP: If you're not using a checkout, that's what "update" does. | 05:45 |
| Peng_ | (Well, technically update is doing the same thing it always does: Updating the working tree to the tip of the branch; in this case, the branch is local, though.) | 05:45 |
| CameronP | ok so Im getting stuck where another developer commits a change | 05:46 |
| CameronP | it tells me i have to update first before commiting changes | 05:46 |
| CameronP | but the update, just says nothing to do (as its just doing it locally i think) | 05:46 |
| CameronP | if i go to command line and do a bzr update from my working directory, then it works ok and connects to the server and pulls their changes and merges them and then i commit | 05:48 |
| CameronP | i Just dont understand why that doesnt work through the gui | 05:48 |
| fullermd | It might be that Explorer isn't doing quite what it should in that case. | 06:15 |
| fullermd | igc might know better | 06:15 |
| CameronP | thanks... guess I'll just wait and see what the go is -has been confusing me all day ;) | 06:16 |
| fullermd | igc: ^^ Explorer not properly update'ing a checkout? | 06:16 |
| === orospakr` is now known as orospakr | ||
| Keybuk | I'm having an enormous amount of errors with bzr 2.0 | 06:55 |
| Keybuk | branches that pass "reconcile" with previous version are now raising Exceptions when using 2.0 | 06:56 |
| Peng_ | Keybuk: Pasteebin your exceptions. | 07:02 |
| Keybuk | just filed bug 441105 | 07:03 |
| ubottu | Launchpad bug 441105 in bzr "bzr: ERROR: exceptions.KeyError: ('command.h-20061011134501-p0varet42063vbuy-1', 'scott@netsplit.com-20070106211437-hfvbhva2w9qextyd')" [Undecided,New] https://launchpad.net/bugs/441105 | 07:03 |
| Peng_ | Oh. That works too. | 07:05 |
| Keybuk | also bug 441120 | 07:41 |
| ubottu | Launchpad bug 441120 in bzr "bzr: ERROR: exceptions.KeyError: ('test_job.c-20060802025841-69d13b49cc35d5ec', 'scott@netsplit.com-20090709110153-7dcfrdmjwojak3ud')" [Undecided,New] https://launchpad.net/bugs/441120 | 07:41 |
| Keybuk | and bug 441125 | 07:56 |
| ubottu | Launchpad bug 441125 in bzr "bzr: ERROR: exceptions.KeyError: ('makefile.am-20080508221105-rbs9wugi1qq76gcs-2', 'scott@netsplit.com-20090702173125-4nayj8jp8h4f8jnq')" [Undecided,New] https://launchpad.net/bugs/441125 | 07:56 |
| dirving | I'm trying to move a project from bzr into a subversion repository, keeping the revision history. I've tried a few things with bzr-svn but I'm not having any luck -- does anyone have any pointers? | 08:05 |
| === LarstiQ_ is now known as LarstiQ | ||
| === thekorn_ is now known as thekorn | ||
| === SamB_XP_ is now known as SamB | ||
| === SamB is now known as SamB_XP | ||
| ronny | jelmer: say, did git/dulwich have something to push via http? (or should abuse something like a light pack + http push requests for the time being) | 18:22 |
| visik7 | is it safe to upgrade to 2.0.0 ? | 18:33 |
| visik7 | plugins will be broken ? | 18:33 |
| SamB_XP | visik7: some might | 18:38 |
| SamB_XP | visik7: but most of them have been updated | 18:38 |
| visik7 | bzr webdav doesn't work | 18:38 |
| SamB_XP | does it simply fail to load? | 18:39 |
| visik7 | yes with this error: not installing http[s]+webdav:// support (only supported for bzr 1.12 and above) | 18:41 |
| SamB_XP | that would be an obvious bug in the plugin | 18:42 |
| visik7 | probably due to this if : if major < 1 or minor < 12: | 18:42 |
| SamB_XP | are you running from a bzr checkout, or an OS package? | 18:42 |
| SamB_XP | (and is this bug reported?) | 18:43 |
| visik7 | SamB_XP: checkout and no it doesn't seem to be reported | 18:44 |
| SamB_XP | well, I would (a) fix that line (b) push it to a launchpad branch and (c) request a merge | 18:44 |
| SamB_XP | maybe also (d) report the bug | 18:45 |
| SamB_XP | ;-) | 18:45 |
| visik7 | fixed | 18:47 |
| visik7 | now how can I create a branch on lp ? | 18:48 |
| visik7 | and request a merge ? | 18:48 |
| SamB_XP | visik7: do you have an account on lp yet? | 18:48 |
| visik7 | yes | 18:48 |
| SamB_XP | did you upload your SSH key? | 18:48 |
| visik7 | yes | 18:49 |
| SamB_XP | did you do a "bzr lp-login"? | 18:49 |
| visik7 | no it says I haven't configured an user | 18:51 |
| SamB_XP | bzr lp-login my-lp-username | 18:52 |
| visik7 | ok done | 18:59 |
| SamB_XP | visik7: okay, I assume you committed the fix to the plugin and are in the working directory? | 19:00 |
| visik7 | yes | 19:00 |
| === cha0s_ is now known as mr_cha0s | ||
| SamB_XP | well, bzr push lp:~my-lp-username/bzr-webdav/version-checking-fix | 19:01 |
| SamB_XP | assuming bzr-webdav is the right name for the launchpad project for the plugin | 19:01 |
| visik7 | yes is the right name of the plugin of the original developer | 19:02 |
| visik7 | but I renamed it | 19:02 |
| visik7 | (the directory) | 19:02 |
| SamB_XP | yes, of course | 19:02 |
| visik7 | it says that bzr: ERROR: Invalid url supplied to transport: "lp:~visik7/bzr-webdav/version-checking-fix": No such project: bzr-webdav | 19:02 |
| SamB_XP | hmm | 19:02 |
| visik7 | do I need to create it from my panel ? | 19:02 |
| SamB_XP | oh, apparantly the project is called bzr.webdav for some unknown reason ??? | 19:03 |
| SamB_XP | so try that again with a "bzr.webdav" instead of "bzr-webdav" | 19:04 |
| SamB_XP | man, this new launchpad theme is way too white | 19:04 |
| visik7 | :) | 19:04 |
| SamB_XP | it needs some panels of some kind ... | 19:04 |
| visik7 | it's committing | 19:04 |
| SamB_XP | hopefully it won't take too long | 19:04 |
| SamB_XP | oh, wait, ... did you try just doing a "pull"? | 19:05 |
| visik7 | yes | 19:05 |
| visik7 | there was no updates | 19:06 |
| SamB_XP | where did you have it checked out from ? | 19:06 |
| visik7 | Created new brench | 19:06 |
| visik7 | I check if there was any update a few minutes ago | 19:06 |
| visik7 | ok I pushed and everything is ok seams | 19:07 |
| visik7 | how to request for a merge ? | 19:07 |
| visik7 | found | 19:08 |
| visik7 | thanks for your support | 19:08 |
| SamB_XP | the thing is, there was an attempt to fix the check for bzr 2.0 back in august ... | 19:09 |
| SamB_XP | and yeah, it looks like that fix should have worked | 19:09 |
| SamB_XP | so, I would try "bzr pull --overwrite lp:bzr.webdav" | 19:10 |
| visik7 | mmm | 19:10 |
| SamB_XP | and if that also works fine, I would go to your merge request and apologize for wasting time ;-) | 19:11 |
| SamB_XP | though of course at least now you learned what to do if you ever find a bug you could easily fix in another plugin | 19:11 |
| visik7 | yes infact | 19:11 |
| visik7 | anyway how can I discard the merge request ? | 19:12 |
| SamB_XP | I'm not sure if you can ;-) | 19:12 |
| SamB_XP | someone else may tell you soon | 19:12 |
| visik7 | ok np | 19:12 |
| visik7 | going out now thank you again now I'll use launchpad instead of github to do stuff like this | 19:12 |
| jelmer | SamB_XP: no, there's no push over http stuff | 19:12 |
| visik7 | I have removed the branch | 19:15 |
| SamB_XP | jelmer: say what? | 19:19 |
| SamB_XP | I didn't mention push-over-http did I? | 19:19 |
| === SamB_XP_ is now known as SamB_XP | ||
| === khmarbaise_ is now known as khmarbaise | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!