=== spiv_ is now known as spiv [01:33] I'm trying to make a new Solo project with Bazaar, what is the advantage of creating a repository for the project at the top level and to nest a main branch within it? [01:34] I would rather just do: `bzr init` :P [01:35] it takes up less space to clone paralell branches === gutworth_ is now known as gutworth [01:37] Alright I won't need that for sure. [01:38] I have another question: What is a good way to put bzr on a server and modify it with GTK+ programs like Olive from a remote computer? === _thumper_ is now known as thumper === thumper is now known as _thumper_ === _thumper_ is now known as thumper === wgrant_ is now known as wgrant === obstriege is now known as obst === obstriege is now known as obst === jam changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://bazaar-vcs.org | http://irclogs.ubuntu.com/ | Patch pilot: vila | bzr 2.1.0b4 and 2.0.3 have gone gold! === BasicPRO is now known as BasicOSX === lifeless_ is now known as lifeless === abentley1 is now known as abentley [07:29] * fullermd grumbles and shakes his fist at stat's fetish for WT's... [07:31] hi vila? [07:36] hi all ! [07:36] hey poolie ! [07:40] hi there [07:40] quick call? [07:40] vila^^ [07:41] sure === oubiwann_ is now known as oubiwann === Odd_Blok1 is now known as Odd_Bloke [10:29] Hi, I have a probleme on svn synchronization after upgrading from bazaar 1.8 - bzr-svn 0.4.14 to bzr 2.0 - bzr-svn 1.0.0 [10:30] bzr pull returns bzr: ERROR: These branches have diverged. [10:30] Is there a solution? [10:33] The branches cannot diverge because it's a read only repository [10:33] perhaps you committed locally? [10:34] No as i said it's a read only repository [10:34] try running 'bzr missing --mine-only' and see what it lists [10:35] it returns all the commit list that came from the svn repo [10:35] in fact it's all the commit since the creation of the branch [10:37] Hmm, that suggests that the commit IDs changed or something happened in how the bzr-svn integration works [10:37] yep [10:38] yes, a long time back [10:38] bzr svn-upgrade [10:38] IIRC [10:38] ok [10:38] its in the svn docs [10:38] I'm trying [10:38] bzr-svn docs. [10:38] Oppps [10:38] I suggest you read them before doing anything. [10:40] The doc is the FAQ file isn't it? [10:59] Sorry but I can't find insterresting docs about svn-upgrade [10:59] add the command itself is not present in my bzr-svn installation === Sam__ is now known as SamB_XP [11:01] Okkin: try filing a question on bzr-svn then [11:02] you mean bzr-svn chanel? [11:11] Ok I find a solution by setting default-mapping = v3 in bazaar.conf [11:11] But I can't find a way to upgrade my repo [11:11] Anyway thaks for your help [11:12] bzr foreign-mapping-upgrade? === jelmer_ is now known as jelmer [11:14] maxb: I didn't try this command but it sounds good [12:09] just did a bzr svn-import but the tags are not being mapped to a bzr revision (although bzr tags does show the tags). Any special option I need to pass to bzr? [12:09] also I find it strange that "trunk" has the tags [12:13] grahal: What do you mean with "the tags are not being mapped to a revision" ? [12:13] bzr tags shows something like [12:13] 0.9.0 ? [12:13] 0.9.1 ? [12:14] etc... [12:14] grahal: that's because the revisions that are tagged are not in the trunk branch probably [12:15] bzr tags --show-ids should show you the revision ids [12:15] hmm, indeed [12:16] the tags appear in trunk and the other branches [12:18] not sure i'm going things correctly [12:18] but [12:18] I want to import the modules in https://z3ext.svn.sourceforge.net/svnroot/z3ext/sources/ into separate bzr repos [12:18] separate bzr branches you mean? [12:18] yep [12:19] just running "bzr svn-import http://z3ext.svn.sourceforge.net/svnroot/z3ext/sources/" should be sufficient [12:19] and create /trunk directories [12:21] let me try === mrevell is now known as mrevell-lunch === mrevell-lunch is now known as mrevell [13:21] good morning everyone [13:54] hi rubbs ! [13:59] hi vila how are you? [13:59] fine, thanks, it's winter here, but so is it in half of the planet... :) === jelmer_ is now known as jelmer [14:02] haha, true. Winter here as well. [14:03] * jelmer waves [14:03] \o [14:04] * rubbs waves back [14:10] jam: ping === Chex_ is now known as ChEx === ChEx is now known as Chex [14:32] morning vila [14:32] morning jam ! === mbarnett` is now known as mbarnett === menesis1 is now known as menesis [15:05] so bzr checkout subfolder any ideas ? can it be done ? [15:05] oly, not supported at the moment [15:05] ah okay, but its being worked on i take it ? [15:06] Isn't it what 'views' are about ? [15:25] jelmer: any new plugin releases I should be packaging for 2.0.3 / 2.1.0b4 ? [15:25] vila: sort of, but honestly not really [15:25] jam: bzr-rewrite 0.5.5 [15:26] for 2.1.0b4 ? [15:30] also, I'm pretty sure that explorer 0.10 should be in 2.1.0b4, but what about qbzr? [15:30] I don't see a new 0.14 release [15:30] so 0.14.5 in 2.0.3 but 0.16 in 2.1.0b4? [15:30] I thought there was a 0.17 comingaround [15:30] I guess bialix and garyvdm aren't around right now [15:38] gee, the weather is bad on FreeNode today... :-/ === froosch_ is now known as froosch [15:57] tsmith: see this thread http://permalink.gmane.org/gmane.comp.version-control.bazaar-ng.general/63029 [16:01] bialix, yes that is my problem exactly [16:01] but i fail to see any responses to that guy? [16:02] WHAT HTE HELL? === deryck is now known as deryck[lunch] [16:02] bialix, yes that is my problem exactly. but i fail to see any responses to that guy? [16:02] 184 revisions [16:02] 2145 file-ids [16:02] 1 ghost revisions [16:02] 1 inconsistent parents [16:02] how do i fix that? [16:03] tsmith: look at the entire thread [16:03] it just URL to first post [16:03] k [16:03] you have to publish a branch where your ghost revisions present [16:03] bialix, i see links for Permalink | Reply | Report this as spam [16:03] no thread links [16:05] tsmith: try there https://lists.ubuntu.com/archives/bazaar/2009q4/063569.html [16:05] AWESOME! [16:05] I'm reading bzr ML via gmane, there is some magic to get thread-view in there [16:05] but I'm using Thunderbird, so... === weigon_ is now known as weigon [16:10] you know, such a horrible bug should not have made it into a major revision (2.0.0) [16:12] it seems freenode storming today [16:12] tsmith: horrible bug? [16:12] I guess you need to work very hard to create ghost [16:12] at least in plain bzr branches [16:13] no it's really easy! === CardinalXiminez_ is now known as CardinalFang [16:36] bialix, tsmith: there is also: https://lists.ubuntu.com/archives/bazaar/2009q4/thread.html#63569 [16:36] hi jam [16:36] jam, thank you veyr much [16:37] Man! Freenode is as bad as Undernet in 1998! [16:38] hey guys, can you check to see if you can access bzr+ssh on Launchpad? I don't see scheduled downtime, but I want to make sure it isn't just something wrong with my setup. [16:38] I get: ... => bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev/: Unable to invoke remote bzr bazaar.launchpad.net; Channel closed. [16:38] so the ssh handshake goes through, but it doesn't seem to have 'bzr' on the other end === jelmer_ is now known as jelmer [16:52] seirously, i'm going to have to give up bzr in about 5 minutes [16:52] none of this crap wroks and i fear i have perpetually screwed up my repository [17:00] tsmith: you can do it without bad words === froosch_ is now known as froosch [17:00] jam: `bzr tags -d lp:qbzr` works for me [17:00] bialix: yeah, I just had the old trunk [17:00] I've updated [17:00] I'm currently stuck because I can't push to launchpad [17:01] but otherwise the installers are getting built [17:01] maybe, I'll get a better response here. [17:01] any losa's around? [17:02] jam: hi there [17:02] jam: can I help? [17:03] hey Chex, I just realized it may be a local configuration fault. I was testing custom remote bzr's, let me check [17:03] sorry Chex, it was all my fault [17:04] I set "BZR_REMOTE_PATH" and it failed when connecting to lp [17:04] which it *should* but our error was poor. [17:04] thanks for showing up, though [17:08] jam: ok [17:13] jam: something bad with freenode today, I'd better go home. Send a mail, if something needed from qbzr/explorer side' [17:24] jams: no worries [17:27] jelmer: there doesn't seem to be a bzr-rewrite-0.5.5 tag === AnMaster_ is now known as AnMaster [18:24] g'day. is there a way i can stop bzr from commiting my entire source tree, when i'm in a subdirectory? [18:24] if i'm in a/b/c, and bzr commit, i only want to commit c downwards, not ALL of a/. [18:27] [[[ [18:27] By default bzr always commits all changes to the tree, even if run from a subdirectory. To commit from only the current directory down, use: [18:27] % bzr commit . [18:27] ]]] [18:27] --http://doc.bazaar.canonical.com/bzr-0.8/tutorial.html [18:27] * Morbus waves. [18:43] a nice option on bzr stat would be relative only [18:43] ie only show paths at or below or the current dir [18:43] i often copy output of stat into a diff or edit tool [18:43] hey guys. think i'm misunderstanding something here,, i have a project on my local machine, i've been working on it and keeping it versioned in a standalone bzr repo... now i want to push my work up to the server, from my local copy i just do bzr push bzr+ssh://me@iptoserver/path/to/bzrdir [18:44] then on the remote server i do bzr up in bzrdir and it says [18:44] bzr: ERROR: No WorkingTree exists for "file:///path/to/bzrdir" [18:44] sorry,,, add to the ned /.bzr/checkout/ [18:45] how come i can't checkout to a working copy on the remote server? === bob2 is now known as Guest23160 === mwhudson_ is now known as mwhudson [19:52] hazmat: 'bzr status .' ? [19:53] jam that still reports path relative to the repo root [19:53] i'd like it to report paths relative to the current directory [19:53] sure, but it only gives the output of that subdir [19:53] so i can actually use the paths it reports [19:53] right now i've got to mangle all the paths to be offset relative to my current location [20:26] i get a segmentation fault when I try and push to a svn repo: http://pastie.org/744641 [20:27] is it supposed to work? i forgot the syntax - dpush, svn push? [20:28] i'd like to push to a new directory [20:34] hi, i'm playing with bzr builddeb. is there a way to do -S with '-sd' getting through to dpkg-genchanges ? [20:35] builder="debuild -sd" [20:35] though -v is generally a better way to control that [20:35] How to rollback the files to a given revision, just to recover a deleted image, then go back to tip? [20:36] I'm using a standalone tree [20:36] lifeless, how is '-v' (--verbose?) involved ? [20:36] -v include all changes later than version. [20:37] same way --builder="debuild -vxyz" [20:37] Can I checkout an old revision to another directory? [20:37] RenatoSilva: revert -r xyz FILE; revert FILE; [20:38] lifeless: no need to commits? ok [20:40] ERROR: Path(s) are not versioned: htdocs/img/edit-confict.png [20:40] I guess because the file was deleted [20:41] * RenatoSilva did bzr revert -r 87 but thinks he should not [20:44] ok, got it with bzr checkout