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