[02:47] i need the ability to store keywords inline in my files like RCS did (ie: $Id$), and i'm looking at the bzr-keywords addon... has there been an "official" solution i should be aware of? [02:50] plus the repo's a year out of date ;] [03:04] Demosthenes: filters [03:10] mlh: the reference i pulled on that isn't quite complete. know any working examples? i'm at 2.0.3 [03:10] keywords IS built on the filter layer. [03:10] oh, there you go [03:10] * mlh gets his coat [03:12] I was always advise people to very carefully consider whether they actually need them, anyway [03:21] its a typical issue where i need version number or branch id in something visible to the end user. [05:31] Hello? [07:05] Hello? [08:13] Hello? [10:48] Interesting. When trying to use the https transport with a mercurial Google Code repository bazaar gives up at the first 405 [10:50] Though with http it seems quite happy to slowly fall back until it finds the right VCS transport [10:50] Should the hg plugin handle https? [12:00] Is there a way bzr-svn could have messed up branch metadata such that bzr makes some *stupid* choices when merging? [12:01] such as reverting changes on the merged-into branch for no good reason [12:03] copying the base/left/right versions of the affected file into new bzr branches and trying the merge there produces a better merge [12:09] maxb: I doubt that's a bzr-svn issue. [12:10] dcoles: yeah, it should handle https but there are some known issues with https not specific to the hg plugin [12:12] jelmer: Ah. Thought that might be the case. [12:12] jelmer: even though the merge is different if I recreate the relative ancestry the files would have had if the project had been in bzr all along, and the merge is better then? [12:12] s/files/versions of the file/ [12:13] jelmer: I'm just trying to look at that Google Go hg import bug [13:45] dcoles: one thing that might work is to uninstall pycurl === radoe_ is now known as radoe [14:03] jelmer: For the moment using http should be fine - not need to push yet [14:04] Just trying to work out why bzr-hg generates an inventory delta that seems to be missing one of the parent directories [14:05] dcoles: just a word of warning; bzr-hg is still very much alpha code [14:08] Ah. Ok. I'll keep that in mind :) [14:48] Is there a command to dump an inventory for debugging? [14:49] like bzr inventory --show-ids but more so [15:03] maxb: Not aware of one, please let me know if you find one :-) [15:04] dcoles: patches welcome :-) [15:06] Heh. I'm trying :D [15:08] People just keep insisting on using things OTHER than bazaar. [15:11] ... or checking in files to SVN with paths like "connectors/perl/temp/\"... [15:12] yeah, that one seems to be becoming more and more of an issue [15:12] I see that there's already a bug for having '\' in a path. [15:12] there isn't anything in bzr that inherently prevents us from using it [15:13] Mainly to be safe on Windows correct? [15:13] we've just been on the side of caution since it's impossible to check out those paths on windows [15:13] yeah [15:13] we know how we'd like to fix this: [15:13] allow backslashes but refuse to check out paths with backslashes on windows [15:13] when adding files with backslashes we'll warn the user [15:14] That seems like the right idea. Much like when people check in files with filenames that differ only by case [15:15] dcoles: right, that's another good example where we should allow files to be added (we already do atm) but need to warn the user. [15:16] If I'm looking at migrating a repository, would the best thing be to "fix" svn's history and then import? Or is it safe to remap the filename at import time? [15:17] dcoles: remapping the filename at import time isn't really possible, unless you use a custom version of bzr-svn and are never going to use the original svn repo again after you've migrated. [15:20] jelmer: Hmm. I figured that might be the end result. Alright. Cleaning up history seems to be the go. [16:04] Hi folks === khmarbaise_ is now known as khmarbaise [19:15] Hi there, I'm trying to use bzr-svn with bzr 2.2b3 but it keeps failing with an error like this: Unable to load plugin 'svn'. It requested API version (2, 1, 0).... [19:15] is there a newer version of the bzr-svn plugin available somewhere? [19:16] I'm currently using http://people.samba.org/bzr/jelmer/bzr-svn/1.0/ [19:16] (from launchpad that looked like the most recent branch) [19:18] jelmer: maybe you could give me a hint? (If it's daylight where you live… :) [19:22] Should I be doing 'bzr branch lp:bzr-svn' - and what difference would that make? [19:30] Oddly, enough that seems to have fixed my problem - even though I'm on the same revision now as before. ¿¿¿ [19:41] well, thanks for the patience I guess. [19:41] adios! [20:14] hi all [20:15] ¿what benefits do Bazaar offers over GIT? [21:46] marioxcc: it has a very clean interface and above all: it has plugins [22:00] C-S: but what about the basic [22:00] branches, files, merges, and so [22:00] what are the differences? [22:19] marioxcc: to be honest, I can't tell you very much about the internal differences, however: [22:20] marioxcc: branching is a bit more traditional in bzr, i.e. you have a folder per branch === nlisgo_ is now known as nlisgo [22:23] C-S: ok [22:23] thanks [22:26] marioxcc: I would just give it a chance. I personally switched from git to bzr a few month ago. [22:26] marioxcc: and I am really happy [22:27] marioxcc: but the differences are not that big in the end. These are all great VCSs === jkakar_ is now known as jkakar [22:28] C-S: I like the model of GIT of commits as a directed graph and branches as references to commits [22:28] i can't figure out why did emacs now use bazaar [22:29] maybe BZR have a awesome feature than git don't [22:29] that is why i'm asking [22:30] marioxcc: well there are nice advantages. launchpad.net is great for example. [22:30] marioxcc: I think, its interface and documentation is just much more consistent. [22:30] marioxcc: but I am not sure why they switched. I did because git became buggy... [22:31] marioxcc: and git has a severe drawback in design with renaming. [22:31] marioxcc: it seems to guess the file names and there are quite a few examples where it guesses wrong. [22:31] actually some we consider the "renaming" thing a feature :) [22:32] marioxcc: in bzr you can also add empty directories. something not possible in git. [22:32] yeah [22:32] about launchpad, i don't like it [22:32] it promotes the void open source [22:32] instead of free softwre :( [22:32] i always use and contribute to GNU Savannah, when i can :) [22:32] marioxcc: I don't understand you. [22:32] oh :S [22:32] sorry [22:33] i mean [22:33] launchpad is about open source software [22:33] marioxcc: right [22:33] savannah is about free software [22:33] marioxcc: what's the difference? [22:33] free software talks about freedom and ehtical values [22:33] open source don't [22:33] marioxcc: is there free closed source software supported? I don't like that. [22:34] ¿? [22:34] the "free" in free software means freedom, not free beer [22:34] we the GNU supporters look for freedom, not zero price [22:34] marioxcc: I know, that's why I use a truly free software: BSD [22:35] marioxcc: I see [22:35] BSD-style licenses allow propietary derivates :( [22:35] marioxcc: right, that is true freedom: "do what you want but cite me" [22:36] marioxcc: it does not force another person to continue the same way [22:36] marioxcc: anyway, that becomes off topic now :-) [22:37] yeah