[00:00] verterok: what would you say the state of bzr-java-lib is? Enough to create a bzr client for an IDE? [00:01] dOxxx: don't you like eclipse? [00:01] dOxxx: it should be enough :) and if it's not is a bug ;-) [00:01] dOxxx: there is a lot of room ofr improvements [00:01] *for [00:02] RenatoSilva: nope, I've been using IDEA for a very long time. I've tried Eclipse a few times and I've never liked it. No offense intended, it just doesn't suit me I guess :) [00:02] verterok: cool. maybe I can massage bzr4idea into a working state. haha. [00:03] heh, cool! :-D [00:04] dOxxx: I like eclipse very much [00:05] RenatoSilva: Each to his own :) [00:05] hopefully we can both use bzr with our favourite IDE [00:07] verterok: didn't work changing the permissions :( [00:18] verterok: didn't work changing redstone to 1.1 :( [00:18] RenatoSilva: :( [00:18] I'm getting now org.vcs.bazaar.client.xmlrpc.XmlRpcCommandException: unknown command "C:\Arquivos de programas\Bazaar\bzr.exe" [00:20] don't make any sense :( [00:20] I got that one a few times when I was running mvn test repeatedly [00:20] If the errors were not random, I would be able to debug it in eclipse at least :( [00:21] before I updated my local branch and xmloutput plugin [00:21] I just branched a new copy of java lib, and xmloutput is up-to-date [00:24] weird [00:26] * RenatoSilva is crying [00:35] when you do any bzr operation, does any file involved is OUT of the branch? [00:36] for example, does bzr create a lock file in tmp dir or user's profile, rather than inside the branch? [00:36] no [00:36] I suspect some lock is lost somewhere, even in Windows registry [00:44] verterok: permission r/w to all in mvn dir, c:/mt (temp), and c:/bzr-java-lib, still failing [00:57] verterok: any idea what happened to CygwinFilePathAdapter? [01:03] what date format does IBazaarAnnotation return from getDate(linenumber)? [01:07] verterok: oh that patch for redstone wasn't necessary, the dev version fixed that in 2007 http://xmlrpc.svn.sourceforge.net/viewvc/xmlrpc/trunk/source/redstone/xmlrpc/XmlRpcClient.java?r1=28&r2=32 [01:08] and didn't release it since that o.O [01:17] bah... looks like bzr4idea was using a forked version of bzr-java-lib :P [01:17] it's referencing stuff that's never existed [01:18] Java developers love to do that :( [01:26] I'll be damned if I can find it. [01:27] aha [01:53] dOxxx: if the changes are good, I'll be happy to merge them in bzr-java-lib, I'll take a look to their branch [01:54] RenatoSilva: thanks for the bug triage ;-) [01:56] verterok: the branch is lp:~bzr4idea/bzr-java-lib/trunk. I merged trunk into my localy copy of it and there are a few conflicts but I think I sorted them out. The changes seem to be mostly minor adjustments of the interface to suit the bzr4idea developer [01:57] verterok: np, btw can't find any reference to redstone.xmlrpc in bzr-java-lib/bzr-eclipse, just like it's not used o.O [01:57] verterok: although, there is one fix to the Ls command for a bug in xmlls, which when given the parameters "." and "--non-recursive" returns an empty list [01:57] well, workaround, not fix :) [01:58] and I checked, the bug still exists in 2.0.1 [01:58] dOxxx: be careful to not make it compatible with idea, but break eclipse :) [01:58] dOxxx: and in bzr-xmloutput trunk I assume :) [01:59] RenatoSilva: nah, the changes aren't that major. [01:59] RenatoSilva: from the top of my head: XMLRPCCommandRunner [02:00] verterok: oh, yeah, since I just checked using my normal bzr install with the xmloutput trunk I installed earlier this evening [02:00] verterok: yeah, just found it :) [02:00] verterok: basically, the following command returns an empty list: bzr xmlls . --non-recursive [02:00] verterok: I wanted to know if bzr-eclipse itself also used redstone lib, but no it doesn't [02:01] RenatoSilva: no, bzr-eclipse only uses bzr-java-lib...or should :) [02:01] dOxxx: oh, ok. sounds like a bug :) [02:02] RenatoSilva: as I merged your encoding-fixes branch in trunk, it's ok to delete the jobs from hudson? [02:02] verterok: ok [02:02] verterok: yes, I think it's a bug in the underlying bzr ls though, which is just reflected in xmlls [02:02] dOxxx: oh, that's bad...but good catch :) [02:03] verterok: well, I think :) [02:03] hmm [02:03] "bzr ls ." works [02:04] there is no --non-recursive option for bzr ls [02:04] so maybe it is specific to xmlls [02:04] dOxxx: probably the option name changed, and xmloutput is still using the old name [02:05] aha: https://bugs.launchpad.net/bzr/+bug/158690 [02:05] Launchpad bug 158690 in bzr "ls --non-recursive PATH : no list" [Medium,Triaged] [02:05] RenatoSilva: if you need to run a new branch on hudson, just create a new job, but copying bzr-java-lib[-xp] job and change the branch url ;) [02:05] so it looks like that bug was "solved" by removing the option :P [02:11] dOxxx: heh, looking a the bzr code, ls changed a lot since I worked on xmlls, probably I introduced that bug :) [02:12] verterok: ok thanks [02:12] verterok: it happens :) I'm filing a bug on xmloutput now [02:12] dOxxx: ok, thanks! [02:13] verterok: https://bugs.launchpad.net/bzr-xmloutput/+bug/482901 [02:13] Launchpad bug 482901 in bzr-xmloutput ""xmlls --non-recursive ." returns empty list" [Undecided,New] [02:14] dOxxx: I "think" I have a fix :) [02:14] but no tests :/ [02:14] woot :) [02:14] verterok: from where did you take xmlrpc 1.1.1, and even 1.1? didn't find it in SF [02:14] verterok: latest release there is 1.0 I think [02:14] verterok: should be simple enough to write a test for it, if you have a framework for creating a temp branch with some files [02:14] RenatoSilva: 1.1 from the redstone page, 1.1.1 build it myself from a svn checkout [02:15] dOxxx: bzr test framework! ;-) [02:15] aha! [02:15] if you want, I can take a crack at writing the test [02:15] I have a little experience with the bzr test framework [02:15] dOxxx: be my guest, and to get the fix too ;) [02:16] verterok: have you already made the fix? or can you send me a patch? [02:16] verterok: ah ok, just a suggestion, instead of 1.1.1, use 1.1_custom0, or 1.1_verterok0 etc... (not sure if mvn can deal with that though) [02:16] RenatoSilva: but it's 1.1.1, they tagged/commited the version bump [02:17] verterok: ah ok [02:17] RenatoSilva: but I can change it to 1.1.1-dev or something [02:17] RenatoSilva: I pushed the xmlrpc-1.1.1 to my maven repo @ verterok.com.ar [02:17] verterok: ok, just a suggestion to clearly identify that 1.1.1 is not released yet :) [02:18] RenatoSilva: yeap, good point :) [02:18] dOxxx: sort of a fix, mostly a hack...gimme 1' and I'll pastebin it [02:19] k [02:19] dOxxx: also, xmlls is one of the xml commands that don't have tests :/ [02:19] verterok: I see. [02:20] verterok: maybe I can steal the bzr ls tests :) [02:20] dOxxx: I did that for most of the xml* commands :) [02:20] dOxxx: http://pastebin.ubuntu.com/319005/ [02:22] ok, guys, I need to leave for a while. see you later! [02:22] dOxxx: thanks for taking that bug ;) [02:23] RenatoSilva: apologize the delay to get the encoding fix merged, thanks a lot for getting it done and poking me :) [02:23] seeya verterok [02:23] * verterok away not here right now [02:23] ooops, wrong command :p [02:33] * RenatoSilva just had a big battle with a roach [02:35] RenatoSilva: bug "fixing" ? ;) [02:39] no, a real roach [02:40] I could kill it, but not the tests bug :( [02:42] :( [02:51] Hmmm... I'm getting a popup dialog when running bzr selftest which says "This application has failed to start because QtHelp4.dll was not found." I wasn't getting this earlier... [02:51] --no-plugins [02:58] yeah except I'm tyring to test a plugin :) [02:59] oh well, it's not stopping the tests from running, it's just annoying [03:17] dOxxx: you created a patch for the test failure I've reported? nice :) [03:18] verterok: when you are back here, the update site didn't work in galileo. I've extracted features and plugins, it works nice, but the build does not contain the redstone patch [03:18] RenatoSilva: yeah, it was pretty simple as far as I could see [03:19] verterok: by work nice I mean no error in log view when opening eclipse [04:16] hey guys [04:17] quick question [04:17] i uncommited and unreverted locally [04:17] not i want to change the state of trunk on launchpad [04:17] to the old state [04:18] seiflotfy, you want Launchpad's branch to have the same state as you do locally? [04:19] yeah [04:19] seiflotfy, bzr push --overwrite [04:19] the branch on launchpad had 1292 [04:19] and i want it back on 1278 [04:21] seiflotfy, bzr push --overwrite will do it [04:22] thx [04:22] worked [12:32] hi - when using bzr-git is there a way to specify the remote git branch to use for pull or dpush (or the original branch) [14:22] Good morning. [15:02] I would like to learn more about the bzrlib python api ... is there a good place to get started? Perhaps some pointers to key concepts / methods to look at first? [15:20] maxb: try having a look at bzrlib/builtins.py. It contains all the bzr commands and should give you a general idea of where to go for a specific feature. === sdboyer_ is now known as sdboyer [15:27] thanks [15:55] When 'bzr rebase' drops you back to the shell for conflict resolution, is there any way to find out which revision it dropped you at? [16:33] maxb: I'm just guessing here, but try 'bzr revno' ? [17:12] dOxxx: This seems to tell you about the last revision that completed rebasing. That's not really all that helpful unless the history is non-branchy *and* you know it well. [17:13] maxb: ah, sorry, was just a guess. I'm fairly new to bzr myself. [17:14] No problem. It seems that bzr-rebase needs a bit of work to bring it up to the standards of hg's offering [17:17] it's a plugin, not a core command, so it may not be receiving the same level of attention [17:21] however, if you file bugs or ask a question at the project page (https://answers.launchpad.net/bzr-rewrite/+addquestion) you may get a better reply than mine :) [17:22] asking on the bazaar mailing list may also work [17:23] maxb: all I know is bzr-rebase has been renamed bzr-rewrite [17:24] LarstiQ: Indeed. A bit odd. Especially since it still needs to be imported as 'rebase' [17:26] maxb, It's slowly being renamed [17:28] jelmer: Hi. Would you happen to know why rebase attempts to only rebase a left-most path of revisions? That seems fundamentally incorrect to me [17:28] maxb, I've just replied to your email [17:29] ah, thanks :-) [17:29] maxb: Basically bzr-rebase was written as a tool to rebase a small local branch on top of an upstream bzr-svn branch [17:29] maxb: not really as a suisse army knive to do large-scale history rewriting [17:30] maxb: Not that I object to improvements of course :-) [17:31] some of the other commands in bzr-rebase do rewrite more (e.g. rebase-foreign) [17:31] * maxb will wait for your respose to percolate through the internet and read that first === Guest43282 is now known as ronny [18:08] Hello [18:08] How would I change a file to say its rev 39? [18:09] and then I could comit the changes [18:11] You wish to alter a file to be the same as it was in a previous revision and then commit that as a change? [18:11] bzr revert [18:11] Well I made changes to a file over many commits [18:11] Then I realized the way I was doing it was correct [18:12] so I would like to replace the file thats there with rev 39 of that file [18:12] then make changes and / or commit [18:12] Xello: bzr revert -r 39 [18:12] cool [18:12] LarstiQ: Thanks [18:13] Xello: don't forget to thank maxb too :) [18:13] whops im an ass [18:13] maxb: Thanks for the help [18:16] Yes! it worked [18:16] I <3 bzr [18:17] In celebration I give to you all a link to some music [18:17] http://www.jamendo.com/en/album/44337 [18:17] Xello: heh, thank you :) [18:17] its free and legal (creative commons) [18:18] I like to feel like I'm an adventure movie when I'm coding sometimes === vxnick_ is now known as vxnick [19:42] I want to see what is the last commit message. bzr log gives me everything. How can I limit bzr log to only give me the very last one? [19:42] bzr log -r-1 [19:42] dOxxx, ah thx. (I tried bzr log -1 with no success) [19:42] np === khmarbaise_ is now known as khmarbaise [22:38] what is the best way to nest an external svn tree into a bzr branch? ... i've checkout my svn tree into a branch A and joined it into my main branch ... [22:38] eMerzh: Ideally the solution would be nested tree support in bazaar [22:38] is there a way to do it without the branch 'A' ? [22:38] until then there are a couple of 3rd-party solutions [22:39] using e.g. config-manager, scmproj or bzr-externals [22:39] what are the pbm with join ? [22:39] eMerzh, join basically merges in the svn tree [22:39] meaning your local repository would basically include the contents of the svn one [22:40] ok jelmer... thanks [22:40] you can then do merges from the svn branch whenever you need to update it [22:41] ok.. dumb question but.. is there a plan (date?) to support Real nested tree so? [22:44] eMerzh: I'm not aware of any specific plans [22:59] Good morning. [23:03] hi spiv === spiv changed the topic of #bzr to: Bazaar version control system | 2.0.2 and 2.1.0b2 have gone gold! time to build those installers | try https://answers.launchpad.net/bzr for more help | http://bazaar-vcs.org | http://irclogs.ubuntu.com/ | Current pilot: spiv [23:13] medical stuff for a few hours - bbl === igc1 is now known as igc