=== Ursinha is now known as Ursinha-zzz [04:50] I've encountered this error while trying to commit my project to a bzr repository hosted by sourceforge.net. http://pastebin.com/ahW8U8Ve This leads me to think that my bzr version is too new to work properly, is this a correct analysis? [04:51] d3jake: no, it means that for whatever reason the data on the server is in a *really* old format. If you can upgrade the server branches you'll fix the problem [04:53] AfC, Unless a change was made to bzr's format breaking backwards compatibility within the last three-four months, I don't see why this error would be happening. I was able to make commits without issues using a not-too-distantly-old version of bzr to the same repository. [04:54] It's not the Bazaar version. I can't tell you what the error is, but it is doing a conversion to something (WAY) older than 2a, and so you're exposing yourself to trouble. Upgrade the server branch & repository if it's yours. And if it's not yours, ask them to. There's no reason, none, to not be using 2a [04:55] Ohh, okay. So the problem is likely on sourceforge.net's end as they are the one's hosting the repository? [04:55] "hosting" is just disk space [04:55] whose project is it? [04:55] yours or !yours? [04:55] and, [04:55] do you have SSH access to the server? [04:55] The project is mine. And no. [04:55] hm. [04:56] Well, others can correct me if I'm wrong, but all you need to do is `bzr upgrade` the (branch and the) repository [04:57] I can't recall if you can do that over bzr+ssh. You might be able to, actually. [04:57] failing that, [04:57] you can bzr upgrade locally to 2a [04:57] (actually, it sounds like you have already) [04:57] and just overwrite completely what's up there. [04:57] So, open a console, go into the root directory of my project, and type "bzr upgrade", and then some sort of command to force the changes onto the server somehow? [04:58] I'll let others take it from here; there are a few web pages out there on the topic I'm sure [04:58] but short answer, yes [04:58] Okay, cool [04:58] Thank you for your help :) [04:59] bzr info [04:59] will guide you on your way [04:59] and read the help for upgrade [05:00] Does it mean anything if bzr info tells me that my project is a standalone tree, and in format 2a? Does this mean that I need to upgrade the repo? [05:09] d3jake: your local tree? [05:09] If it says that, then you're fine locally (and is the case as evidenced by the strange error you got) [05:10] d3jake: if it says that for the remote tree, you are finished [05:10] AfC: Yes, it is my local tree. [05:10] I'm wading through trying to see if I can et the remote tree fixed, but I'm nearing the time when I should shove off for the evening... [05:11] so just do [05:11] $ bzr upgrade bzr+ssh://path/to/remote/tree [05:11] that'll work, or not [05:11] failing that, just remove it and upload a new one [05:11] Remove it? As in delete the remote tree, and then reupload? [05:12] Wouldn't I loose all of my revision history? [05:16] Ah well, I need to bail. Thank you for your help. [05:59] If you've got conflicts, can you use `meld` to sort it out? [05:59] (ie, "yes", but what's a good idiom?) [06:12] AfC: not sure, but I'd be interested to hear if you find one! [06:12] spiv: ie, `bzr diff --using=meld` is vaguely a step in the right direction; [06:12] it seems like [06:12] $ meld path/to/file.OTHER path/to/file.THIS [06:13] is about right, but still, it's a bit fidgety [06:59] hello everyone, could anyone please tell me where can I set the proxy for bzr? to add a new line "http_proxy = http://some.proxy.address:port/" in bazaar.conf file doesn't work for me. Thanks! === frakturfreak_ is now known as frakturfreak [08:18] hi all ! [08:20] Eh? Again? Didn't you just say that yesterday? [08:54] fullermd: it's like the days just keep coming and ocming! [08:54] TimMiao: set it as an environment variable [09:05] spiv: I know! I'm _sure_ I never authorized that! [09:48] . o O (Did I just saw this groundhog *again* ?) [09:50] Groundhog? Does that mean I get six more weeks of insomnia? :D [09:54] Peng: you could always transform that into six weeks of late-night Bill Murray movie watching! [09:56] I love this movie but... six weeks... wow :) [09:57] my daughter was born on groundhog day. [09:57] Did she see her shadow on the way out? === Ursinha-zzz is now known as Ursinha [12:37] hi, while checking out code I get "bzr: ERROR: extra argument to command checkout". How do I solve it? TIA. [12:40] svaksha, what command are you running [12:41] beuno: http://www.gnuenterprise.org/developers/bzr.php <-- trying to get the source [12:41] bzr co bzr branch http://bzr.savannah.gnu.org/srv/bzr/gnue [12:41] right [12:41] so you don't need the first part, "bzr co" [12:41] just: bzr branch http://bzr.savannah.gnu.org/srv/bzr/gnue [12:42] beuno: still throws this error, bzr: ERROR: Not a branch: "http://bzr.savannah.gnu.org/srv/bzr/gnue/". [12:43] * svaksha tried it with sudo too [12:44] svaksha, FWIW, that page has it wrong [12:44] not sure if it can be reported [12:44] http://bzr.savannah.gnu.org/srv/bzr/gnue 404s [12:44] beuno: yes, but i dont know how else to get the source [12:44] and bzr co bzr branch is from [12:45] svaksha, try: bzr branch http://bzr.savannah.gnu.org/r/gnue/ [12:45] * svaksha has been trying different brz permutations with no luck [12:45] s/brz/bzr [12:45] no, the url in that page is wrong [12:46] beuno: that worked, thanks :) [12:46] cool, np [12:51] beuno: fwiw, I reported the error in their irc channel. So thanks! [13:00] jelmer: ping === oubiwann is now known as oubiwann_ [13:48] vila: hi [13:48] jelmer: hi there [13:48] jelmer: saw my pm ? [13:49] vila: no, thanks for the reminder [13:52] ?nested [14:05] jelmer: did you get failure reports from pqm ? [14:10] jelmer: if yes, can you try feed-pqm my submission about 321320-isolate-doc-tests ? [14:14] vila: yep, I did get (strange) failure emails [14:15] jelmer: don't resubmit mine ! Just got mails [14:18] jelmer: what kind of strangeness ? [14:29] vila: I don't remember actually, I'll retry. [14:33] jelmer: already failed right ? [14:34] jelmer: meh, misread the page.. again... [14:41] jelmer: or not ? [14:41] jelmer: you sent 2 requests ? [14:58] yeah [14:59] jelmer: got mail for the first one ? [14:59] Yeah - PQM test failure. [14:59] Ran 0 tests in 0.000s [15:00] And empty output files attached [15:00] merge http://bazaar.launchpad.net/~jelmer/bzr/daily-ppa http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev [15:01] ha, I feel less alone :-/ [15:06] ...committing is broken again? [15:06] that's not good, last thing to land was by me,,, [15:08] mgz: don't be so paranoid :) [15:08] . o O (Or how would we get you...) [15:08] mgz: I looked at it, but saw nothing wrong [15:09] mgz: my pqmlike setup is fine with my patch too :-( [15:09] maybe it's not my fault and the pqm box just ate too much over xmas and hasn't recovered [15:12] well, nothing has landed since... unless you count failed submissions, pqm is on diet :) === Ursinha is now known as Ursinha-afk [15:35] mgz, jelmer: sounds like the pqm *host* have been upgraded to lucid while we still run in a hardy chroot and there are.... unknown issues :( === Ursinha-afk is now known as Ursinha [15:36] See what happens when you use adjectives instead of version numbers? :p [15:38] vila: ah [15:42] jelmer: and stop queuing (s) my submissions, email (e) them instead when using feed-pqm:D === Ursinha is now known as Ursinha-lunch === beuno is now known as beuno-lunch === beuno-lunch is now known as beuno === Ursinha-lunch is now known as Ursinha [19:00] A co-worker committed a change, pushed it, and I pulled it.. the commit is rubbish and should NOT be committed... How can I remove or revert this entire commit, and redistribute it? [19:01] I'm confused I just tried to commit to my central repo and it gave me a message saying that "No WorkingTree exists" I thought I didn't need a working tree for a central repo [19:02] Phoenixz: you can commit the revert of that commit, e.g. "bzr revert -r -2 && bzr ci -m 'revert broken commit'" [19:02] Phoenixz, can you just revert your copy then commit it? [19:02] knighthawk: you shouldn't need a workingtree indeed - how are you committing to the central repo? [19:03] jelmer, 'bzr commit -m "update repo" sftp://path to repo' [19:04] knighthawk: That will try to do a commit in that location [19:04] knighthawk: You probably want to commit in your local branch. [19:04] if your local branch is bound to the central branch the changes will automatically be pushed to the central branch. alternatively they can be pushed manually [19:04] so you probably want: [19:05] "bzr bind sftp://path to repo; bzr commit -m 'update repo'" [19:05] bzr ci -m 'update repo' && bzr push sftp://path-to-repo [19:05] if I run bzr info It has the central branch set up for push branch and submit branch [19:06] knighthawk: in that case you wouldn't need an argument for "bzr push", but you'd still need to run it if the branch is not bound [19:06] but I would like to commit on my local as well. Right now I'm more concerned about getting my team up to speed on BZR so we can all use it. [19:07] knighthawk: if you run "bzr ci -m 'foo'" without any other arguments it will commit to your local branch [19:07] knighthawk: if you've bound the branch to another branch it will automatically push the new commit there as well (hence the "bzr bind" command I mentioned earlier) [19:07] knighthawk: you don't have a bound branch from what I can tell, so you'll need to bind it manually. [19:16] jelmer thanks. I'll try the bound then see if that works. [19:19] bzr: ERROR: sftp://repos.grdev.com/opt/bzr-repos/grws/.bzr/ is not a local path. [19:19] when I try to commit after the bind. [19:22] bzr: ERROR: Permission denied: "/opt/bzr-repos.grws": [Errno 13] Permission denied [19:22] when I try to push [19:24] I want to remove a file from my working tree but don't want to remove it from my file system. I *should* have set up bzr ignore before it got picked up by my working tree but I didn't. [19:25] now how do I remove it without using bzr remove. or is there a way to tell bzr remove to leave the file on my filesystem? [19:25] just found the --keep option. Thanks [19:31] knighthawk: when you commit you shouldn't specify the remote repository [19:33] hello, is there a way to completely revert a commit, the same way you would say, "git reset --hard HEAD^" ? the git command erases the -1 commit from history, forever as if it never existed [19:33] bzr merge . --revision -1..-2 kinda gets me close [19:33] but i still see the -1 commit in my log [19:35] achiang, bzr uncommit [19:35] ah! [19:35] * achiang goes to read the man page [19:36] james_w: perfect, thank you [19:36] jelmer, thanks I think that's what I was doing wrong. [19:37] achiang, you'll want a bzr revert as well to match reset --hard [19:37] james_w: yeah, i just discovered that [20:26] bug 700000! [20:26] Launchpad bug 700000 in software-center (Ubuntu) "software-center crashed with IndexError in _build_view(): list index out of range (dup-of: 631415)" [Undecided,New] https://launchpad.net/bugs/700000 [20:26] Launchpad bug 631415 in software-center (Ubuntu) "software-center crashed with IndexError in _build_view()" [Undecided,New] https://launchpad.net/bugs/631415 [20:26] ...is a dupe. [20:46] Well, better luck with 800000. [21:10] hehe [21:10] mgz: I managed to get 600000 IIRC :-) [21:10] bug 600000 [21:11] Launchpad bug 600000 in hitchhiker (Ubuntu) "missing dependency on Bazaar" [Low,Fix released] https://launchpad.net/bugs/600000 [21:11] yup :) [21:11] go jelmer :) [21:11] my greatest accomplishment of 2009 :-P [21:11] had a look at apache-bzr source. [21:12] nice idea. [21:12] mgz: the code does indeed need some more work :-) [21:13] ...that... wasn't the implication >_< [21:13] :) [21:14] There was a reason the announcement said it was a PoC :-) [21:17] avoids the wsgi mess and confusion neatly at any rate. [22:42] I'm trying to remember the syntax to include the user name and password in the URL. [22:42] something like sftp://username:passwd@example.com [22:42] only that doesn't seem to be working, and I can't think of anything else. [22:43] don't do that for sftp [22:43] sftp://user@example.com/ does work, though [22:43] er "don't put passwords in there for sftp" [22:44] I've got members of my team using Windows. and I have no idea how to tell eclipse what password to use without putting it in the path. [22:44] nah, use ssh keys [22:44] perhaps in bzr I can tell it the passwd then eclipse wouldn't have to know but again. Don't know how to do that in windows. [22:45] hmmm that sounds like a good solution actually. [23:23] A coworker of mine added, comitted, and pushed files into a repo that should not be there.. I pulled those files, and now I'm stuck with them. I want these files not only out of the WT, I want them out of the repo, I want that commit gone (the files are copyrighted, the repo is open source).. How can I undo / revert / remove this commit? [23:23] bzr uncommit [23:24] okay I'm confused again. I just did a commit to a central repos of revision 7. However whenever other members of my team try to update they just get revision 6 what am I doing wrong. [23:25] thats not much info to go on but the logical assumption would be that you've only committed locally [23:33] Phoenixz: exporting and importing are your only options afaik [23:35] bob2: ok.. On a non-copyright issue then, is it possible to "uncommit" or unmerge those things away? [23:35] bob2: like, remove commit 34... 34 will still be there in the repo, but at least won't affect files.. ? [23:35] yes, 'bzr rm' :) [23:36] bob2: bzr rm is on file level.. there isn't anything like that on commit level? [23:36] kinda [23:43] bob2: kinda... ? as in? [23:44] as in I'm not sure what the point is - bzr rm leaves stuff in the rev history the same way as bzr revert would [23:47] Phoenixz: the important question is: is the problem commit the last commit in the branch?