/srv/irclogs.ubuntu.com/2009/12/28/#bzr.txt

=== ereslibre_uni is now known as ereslibre
MTecknologyInteresting error -   bzr: ERROR: RemoteRepository(bzr+ssh://bazaar.launchpad.net/~ubuntu-drupal-devs/ubuntu-drupal-locomap/6.x/.bzr/) is not compatible with CHKInventoryRepository('file:///home/michael/tmp/ubuntu-drupal-locomap/.bzr/repository/') different rich-root support01:33
wgrantSurprisingly little bzr-bashing on /. so far...03:50
gutworthsome people don't like bazaar?03:51
=== abentley1 is now known as abentley
akitadaHi, can I edit history in bzr repository?05:41
lifelesswgrant: ?05:55
wgrantlifeless: The Slashdot article about Emacs moving to bzr has surprisingly little bzr bashing.05:57
akitadawgrant: that news made me feel like trying bzr for the first time06:12
akitadaI use git and hg but haven't used bzr06:13
akitadastill feeling bzr is a bit peculiar.06:21
Wellarkcould someone please explain to me how revision can have multiple parent_ids?10:25
PengWellark: A merge.10:27
WellarkPeng: OK, so the end result is that revision lists parent_id:s from both trees. makes sense. thanks! :)10:41
__monty__Hi, I'm having some trouble getting the bzr source code, could someone offer some help?12:05
franck-brethello, does anyone can tell me how to have compatible repository with hardy server LTS (bzr 1.14) ?12:05
Pengfranck-bret: Ideally you would use the PPA to install the latest version of bzr on it.......12:06
Pengfranck-bret: If not, you should use the 1.14-rich-root format.12:06
franck-bretive put my log here http://pastebin.com/d7bb155a712:08
Pengfranck-bret: Oh god, 1.3.1? Upgrade, dude.12:09
franck-bretit's a server with lastes UBUNTU LTS ...12:09
Pengfranck-bret: And?12:09
Pengfranck-bret: https://launchpad.net/~bzr/+archive/ppa12:10
franck-bretlast bzr version for LTS isn't 2.**12:10
Pengfranck-bret: So use the PPA.12:10
__monty__How do I get the bazaar source?12:10
franck-bretok thanks, i'm gonna upgrade bzr, seems to be the more simple and evolutive way, thanks Peng12:11
Peng__monty__: "bzr branch lp:bzr" or download a tarball from the website.12:11
bialix__monty__: bazaar.canonical.com -> Download -> Sources12:11
Pengfranck-bret: :)12:11
__monty__Can i use "bzr branch lp:bzr bzr.dev" to download the source to a folder named bzr.dev?12:12
Peng__monty__: Yes.12:12
__monty__I get this error when I try:12:13
__monty__Permission denied (publickey).12:13
__monty__bzr: ERROR: Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if problems persist.12:13
PengUh.12:13
Peng__monty__: You've run "bzr launchpad-login" but your local SSH key doesn't match any of the ones you have on Launchpad.12:14
__monty__I registered on launchpad and then I ran "bzr launchpad-login __monty__" , but this gave me12:15
__monty__(erroneous enter)12:15
__monty__I registered on launchpad and then I ran "bzr launchpad-login __monty__" , but this gave me12:15
Peng__monty__: The username "__monty__" does not seem to exist.12:15
__monty__But I can login on launchpad.net12:16
Peng__monty__: Really? And that's your username?12:16
__monty__Yes.12:17
Peng__monty__: The 404 error at https://edge.launchpad.net/~__monty__ says otherwise.12:17
PengI'd be surprised if Launchpad allowed leading underscores in usernames.12:17
__monty__Ok, DisplayName probably isn't the same as Name then.12:19
__monty__How do I register an SSH key?12:20
Peng__monty__: https://launchpad.net/~$name/+editsshkeys12:21
Peng__monty__: Or, click this: https://launchpad.net/people/+me/+editsshkeys12:22
__monty__How do I create such a key, I'm on mac os X.12:24
Peng__monty__: I dunno. Do you normally just use OpenSSH? ls ~/.ssh/*.pub, or the OS X equivalent.12:26
Peng__monty__: I'm not an OS X person; you should Google it.12:28
Peng(OTOH, there are a lot of terrible tutorials on Google, but...)12:29
* __monty__ is googling12:29
Pilky__monty__: follow these instructions: https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair12:29
Pilkyfollow the Linux instructions12:29
Pilkybut skip 112:29
PilkyOpenSSH is already installed12:30
__monty__Should I create an  rsa or a dsa key?12:31
Pilkyrsa12:31
PilkyOS X is just unix so whenever there are no specific OS X instructions for something relating to the command line, try using the linux instructions12:31
__monty__I didn't yet know os X has ~openssh builtin so I thought I couldn't follow those steps without apt-get.12:32
__monty__Thanks for the help. :-)12:36
__monty__If I were to try some debugging where would I start looking in the source?12:39
maxbdebugging what?12:44
__monty__Well, nothing specific, some trivial bugs, but if you need a specific example: https://bugs.launchpad.net/bzr/+bug/25717012:48
ubottuUbuntu bug 257170 in bzr "log does not record bzr version" [Low,Confirmed]12:48
Peng__monty__: I'd grep the codebase for some of the stuff that is logged to find it.12:53
__monty__Peng: How would you go about that with this specific bug?12:54
Peng__monty__: I'd check ~/.bzr.log, find something juicy, and grep for it . .12:57
__monty__Sorry for my ignorance, but what would you call juicy?13:00
Peng__monty__: Something that probably wouldn't have a lot of false positives. Actually, there aren't many choices, so I guess it would be "bzr arguments".13:02
__monty__So I just look for a line kind of like: "print "bzr arguments: %s" %(...)13:04
Peng__monty__: That's what I'd do.13:05
__monty__Peng: And how would you look for this: https://bugs.launchpad.net/bzr/+bug/23952313:05
ubottuUbuntu bug 239523 in bzr "bzr tag --quiet not obeyed" [Low,Confirmed]13:05
Peng__monty__: Start in cmd_tag in bzrlib/builtins.py and/or grep for "Created tag".13:06
__monty__Ok, thanks for the help Peng.13:07
ronnyhi14:08
zekopeko_hi14:08
ronnydoes bzr has some kind of concept for per-file metadata14:08
zekopeko_is there a simple way to check the revision of a branch?14:09
Pengzekopeko_: bzr revno14:09
Pengzekopeko_: bzr revision-info too14:09
zekopeko_cool. thanks14:09
rubbsronny: can you clarify your question? I'm not sure what you mean. Do you mean does bzr keep metadata on each file?14:10
ronnyrubbs: i mean if there is a way to have custom per-file metadata14:11
rubbsmmm... not that I know of, but I'm not a dev.14:11
ronnysup jelmer14:11
Pengronny: Like svn? Um, I imagine that's how the exec bit is stored, so probably. But you definitely can't add arbitrary properties without writing some Python.14:11
jelmerhey ronny14:12
ronnyjelmer: does bzr have a way to have own per-file metadata entries, preferably versioned, too14:12
jelmerronny: nope, we don't have anything like that yet.14:12
jelmerronny: you can of course store a dictionary with files as keys in the revision properties14:13
ronnymeh, ok14:13
PengOh.14:13
ronnyjelmer: any idea if the new repo format is able to actually store those?14:16
Wellark[]ugghh.. this is depressing.. I'm trying to verify revision signatures on server side on push in pre_change_branch_tip_hook so that I can reject the push if the verification of the signatures fail or they are missing. repository.has_revision() returns True for the new revisions, but repository.has_signature_for_revision_id() returns False, even though the revision are signed before the push :/14:17
jelmerronny: revision properties are supported for all formats in use today14:17
ronnyjelmer: i mean per-file properties14:17
jelmerronny: There is no new file format in development at the moment as far as I know.14:18
jelmerronny: There won't be a new default file format before 3.014:18
ronnyok14:19
Wellark[]I'm a bit lost right now.. I'm not sure if there's any way to access the signatures before the push is completed14:19
ronnyso i can just ignore that after all14:19
jelmerwellark[]: Hmm14:20
jelmerWellark[]: Does repository.has_signature_for_revision_id() return True for those revisions after that push, from a new bzr instance?14:21
jelmer(are the signatures actually pushed correctly/)14:21
Wellark[]jelmer: I'll check14:22
zai did this: bzr init    bzr: ERROR: Already a branch: "."14:35
zahow can i change my branch?14:35
Wellark[]jelmer: you got it right.. the signatures are not transfered..14:35
Wellark[]interesting..14:35
Wellark[]I'll investigate14:35
jelmerwellark[]: Thanks14:36
jelmerwellark[]: I wouldn't be surprised if there was a bug there, since the signature code isn't used very heavily at the moment14:36
Wellark[]jelmer: I'll do my  best14:39
zai am current ly using /project for my branch. but now i want to change it to /web/project . how can make these changes?14:39
Wellark[]last night was the first time I looked at bzr source code :)14:39
rubbsza: just say "bzr branch /project /web/project" and that will create a mirror to the new location. After that you can delete the old branch.14:40
zarubbs: i am getting error : "target directory already exists"14:45
rubbsza: try using the --use-existing-dir flag14:46
rubbsso it should read "bzr branch --use-existing-dir /project /web/project"14:46
zarubbs: error: already a branch14:47
zaohh sorry14:47
zawait14:47
Wellark[]jelmer: this was probably an "user error".. I signed some already pushed revisions with sign-my-commits and assumed that the signatures are pushed when I make a new push14:53
Wellark[]that's not the case if there's no other changes14:53
jelmerWellark[]: Well, ideally we should also be fetching missing signatures for existing revisions14:53
Wellark[]jelmer: yeah, but that's now only a minor inconvenience if I can get the hook working for new revisions.14:55
Wellark[]jelmer: thanks for asking the right question ;)14:58
jelmerwellark[]: np - it's working now?14:59
Wellark[]jelmer: yes, infact it is. just tested :)15:02
Wellark[]sweet!15:03
zomborhello, im wondering if anyone can help me out, my auto complete doesn't appear to be working when i press tab to complete a directory for instance, anyone know why this might be?15:04
maxbjelmer: Hi, if you're around, how should I submit a bzr-rewrite branch? The branch description on Launchpad says MPs there will be ignored.16:37
maxbbah16:37
__monty__Can anyone tell me where  can find documentation of "trace.mutter"?16:58
maxbbzrlib/trace.py ? :-)16:59
__monty__Thank you, I thought trace.mutter referred to the builtin trace module.17:01
Wellarkgah.. the signature handling is not satisfactory..17:32
Wellarkif I try to push revisions which do not have signatures and the push fails and I sign the revisions and push again the signatures are not sent17:33
WellarkI haven't yet figured out what actually happens on a push17:55
Wellarkrepository.py is also quite massive :)17:55
gutworth_welcome to version control :)17:56
=== gutworth_ is now known as gutworth
Wellark:)17:57
Wellarkat least it's nice that revision signatures are separated from actual revisions inside Repository18:02
Wellarkprobably allows all sort of neat stuff to be implemented without a fear of breaking revision logic18:03
WellarkI'm already thinking about resigning revisions etc :P18:04
maxbOn a related note it also sucks that tags aren't push/pulled unless revisions are being transferred too18:09
Wellarkmaxb: really?18:16
Wellarkthat's truly sucks18:16
WellarkI'll keep an eye on that too when I _try_ to fix the signature problem18:17
Pengmaxb: That's not the case, or didn't use to be.18:17
tbnorthhi all - the Inkscape project recently moved to bzr for VCS and someone's workflow resulted in a months worth of different people's revisions becoming sub-revisions of one person's commit.18:17
PengOr maybe it only applied when the destination's .bzr/branch/tags was missing.18:18
tbnorthapart from educating people about correct workflow, is there any way to prevent this from happening?18:18
tbnorthit upsets people ;-}18:18
Pengtbnorth: Not really. It's a standard workflow for people to merge lots of others' revisions.18:18
tbnorthPeng: so people should just get used to it?  Part of the problem is that launchpad doesn't show the subrevisions, so people think they're lost18:19
Pengtbnorth: Well it's not like the revisions are actually any less important or anything.18:20
tbnorthok, just wondered if there was any setup which made it harder for people to do this accidentally18:21
tbnorththe preferred workflow would be to merge your local changes into a current copy of the trunk and push that, so your local commits become subrevisions, and not all the commits which occurred since you branched18:22
maxbPeng/tbnorth: maybe append_revisions_only?18:32
maxbPeng: (re tags) Hmm.... I guess I shall have to re-test18:32
tbnorthmaxb: thanks, sounds interesting, will investigate18:33
maxbtbnorth: I'm guessing that the problem workflow is that of merging trunk into your feature branch, and then pushing to trunk?18:34
tbnorthmaxb: exactly18:34
tbnorthI understand no real damage is done, but others coming from SVN are all disconcerted, thinking things are lost18:35
tbnorthand people prefer a linear change log18:35
maxbWell, the 'damage' is that the revision history becomes less comprehensible18:36
tbnorthright, so append_revisions_only would help?  I'm still looking for docs for it18:36
PengIt might help, but I wouldn't be completely sure.18:37
PengNo revisions are being *removed*, some of them just aren't mainline anymore.18:37
tbnorthI've set up a little test script, I'll try it with that enabled18:37
maxbAssuming I've undersstood it correctly (which I don't guarantee), it should cause bzr to deny pushes which would move revisions off the mainline18:37
Pengtbnorth: Anyway, this is mostly a user education thing...18:38
Pengtbnorth: BTW, I bet you can do a clever merge or two to flip the mainline over again.18:39
tbnorthPeng: sure, I've been through the loop once on another project which is now quite happy with bzr, but on this project core developers are not happy at the moment18:39
tbnorthPeng: I'm not going to try and undo anything, nothing's lost at the moment, I don't want to try and be clever and break something for real18:40
Pengtbnorth: Meh, it would be hard to actually break things.18:40
tbnorthok, in my test code append_revisions_only blocks the push that would change the log, great, now the question is can that be set on a launchpad hosted branch?18:42
maxbSure, it's just a config file option18:45
maxbYou may need to get a little sneaky to change the config file though18:45
tbnorthhow so?18:45
maxbEither doing it via the bzr API, or going in via sftp18:45
maxbtbnorth: btw, has further development happened on trunk since this flip?18:46
tbnorthyes, a couple of commits I think18:46
PengShould be really easy with the API.18:46
PengHold on.18:47
maxbpython -c 'import bzrlib.branch as b; b.Branch.open("bzr+ssh://bazaar.launchpad.net/~maxb/tortoisehg/ppa").set_append_revisions_only(True)'18:49
PengDamn, you beat me.18:49
tbnorthhehe, lol :-)18:49
maxbIf it's only been a few commits, it still might be worth straighening out18:50
tbnorthwhat would the procedure be?18:50
maxbbranch the former mainline; merge the commit which broke things; commit; for each subsequent revision: merge; commit18:51
maxbpush the result18:51
PengOf course, turn off append_revisions_only first. ;-D18:52
Peng(what maxb posted earlier, only replace True with False)18:52
tbnorthok, I could try that locally I guess, actually I don't have any commit permissions on this project, but those that do might want to do that18:52
tbnorthand I'll do the set_append_revisions_only thing on the other lp project I work on.18:53
maxbIs lp:inkscape the problem branch?18:53
tbnorthyes18:53
tbnorththanks for this help, people were panicking about bzr being usable, which I knew was over reacting18:54
maxbRight, so you'd have the problem and 4 subsequent commits which would require individually merging onto the former tip18:56
maxbDoable18:56
maxbWhilst you're at it, you might point out that their repository format is rather ancient18:57
tbnorthmaxb: that's an issue I've seen on a couple of projects, what's the easiest way to fix it?18:58
PengTo fix what, ancient-formatitis? "bzr upgrade".18:58
tbnorthfollowed by a push?  I'm not familiar with adminning lp branches18:59
maxbThis is the first time I've seen an active branch using something that's pre-knitpack :-)18:59
tbnorthprobably the person who set it up didn't know better19:00
maxbupgrade is an in-place operation, but can be run on a remote URL19:00
tbnorthso if someone with the proper rights does `bzr upgrade lp:inkscape` that would do it?19:00
PengYeah.19:01
tbnorththanks19:01
Pengtbnorth: Tell them to be careful what they upgrade *to*. Upgrading to 2a gets a bit complicated because it has rich roots, though even an older format like 1.9 would be an improvement and put them in this century. :P19:02
tbnorthPeng:  `bzr upgrade --format=1.9 lp:inkscape` would be the safest improvement, that's what you're saying?19:06
maxbHowever, given the format is already rich-root, that's not an issue19:07
maxbReally it depends how much they care about users of old versions of bzr19:07
PengIt is? Um. Who the heck uses an ancient rich-root format?19:08
maxbPersonally I'd hope no one would be labouring on with bzr 1.x now bzr 2.x is here, but I guess that's not a realistic expectation19:08
PengThey're very lucky, but still.19:08
maxbIt's Knit419:08
maxb(aka 'rich-root')19:08
PengAh.19:08
PengSeriously, it was a good decision, but I'm surprised someone chose it...19:08
maxbOf course, there's still the 'different serializers' incompatibility when switching to 2a19:09
Pengmaxb: Only a problem with stacking.19:09
maxbAn in-place upgrade to 2a would break branches stacked on the trunk...19:09
maxbindeed19:09
maxbSo, yeah, personally I'd probably take it up to 1.9-rich-root19:10
PengHold on a sec. Given how old the format is, it's unlikely anyone's using stacking.19:10
maxbCan't you stack *on* hideously ancient formats?19:10
maxbIt's a shame there's no way to ask Launchpad "Who's stacked on me?"19:11
PengDoes stacking depend on the repo format or just the branch format?19:11
maxbI think it depends on the stacker's format but not the stackee's?19:14
maxb(Other that the 2.x serializer change)19:14
maxbjelmer: Hi, if you're around, how should I submit a bzr-rewrite branch? The branch description on Launchpad says MPs there will be ignored.19:20
jelmermaxb: please send merge requests to me personally (jelmer@samba.org)19:24
=== tbnorth is now known as tbrown_afk
maxbok, will do19:27
Pengjelmer: Just curious, why?19:34
Peng(Why not use the LP merge proposal system, I mean?)19:34
maxbIs the reason for the word 'with' in the bzr reconfigure --with-(no-)trees options because --trees and --no-trees would be interpreted as a single boolean option with a negated form?19:50
* maxb is contemplating how to add reconfiguration of the append-revisions-only option19:50
NfNitLoopbleh.  I'm using git-svn to work with this svn repo that bzr-svn can't deal with.   It's making me miss bzr. :p19:52
NfNitLoophad to go ask in #git how the heck to push my locally changed branch back up to svn.  It was a bit convoluted.19:52
jelmerNfNitLoop, why is bzr-svn not working?19:52
NfNitLoopjelmer: In the history, someone checked in (then removed) a file with a \ in its name.19:52
jelmerpeng: Launchpad does not attach merge directives, only plain diffs19:53
jelmerpeng: making it impossible to deal with merge requests while offline19:53
jelmerNfNitLoop: Ah, ok19:54
jelmerNfNitLoop: to be pedantic, bzr doesn't allow \, bzr-svn should be fine with backslashes19:54
NfNitLoopI actually started my own bzr branch to try removing the restriction re: '\' in file names but didn't get it to a working state.19:54
NfNitLoopyep.  I've talked about it before in here. :)19:54
jelmerah, sorry :-)19:54
NfNitLoopI was mostly just complimenting you on how nice bzr-svn integration is compared to git-svn.19:55
NfNitLoop'bzr svn-push <my-branch-location>' is 3-4 steps in git-svn.19:55
jelmerthanks, glad to hear :-)19:56
jelmerthe \ restriction is really silly, it should be trivial to remove19:56
jelmerit just hasn't been done yet because we need to warn users that a created branch won't be usable on windows19:57
maxbIs there any way to get 'bzr send' to send GPG signed merge directives, short of doing it via a GUI MUA?20:00
maxbIdeally I'd like 'editor'-type composition, but with GPG signing20:01
zomborhello, im wondering if anyone can help me out, my auto complete doesn't appear to be working when i press tab to complete a directory for instance, anyone know why this might be?20:07
NfNitLoopzombor: auto-complete for directories?  Might that be a better question for #bash?20:21
zomborNfNitLoop: but it works for all other commands, and it used to work in bzr20:21
zombori thought maybe it was a plugin that got messed up or something20:22
=== tbrown_afk is now known as tbrown
tbrownzombor: in bash the `complete` command can impact completion for specific command lines, e.g. `complete -C ~/bin/bzropts bzr` would cause the program ~/bin/bzropts to be used to handle completion for command lines starting with bzr.20:26
zombor`which bzropts` bzropts not found20:28
zombor=/20:28
zomborim using zsh also20:28
tbrownI made that up, there's no such program, I was just pointing out that complete, in bash, can cause inconsistent autocomplete activity20:29
tbrownperhaps it's a question for #zsh20:29
zomborhrm, i wonder what i did to cause it to not work...20:30
zomborim pretty sure it stopped working after i installed bzr into my home directory20:30
NfNitLoopzombor: if you had previously installed bzr via your package manager, it may have configured bzr autocomplete for you.20:46
zomborprobably...20:46
NfNitLoopso if you uninstalled it to install a different version in your home directory, that would explain it.20:46
zomborwell, i didn't uninstall the system version20:46
zombori just added my $HOME bin dir to my $PATH20:47
zomborim going to install the stable version from launchpad via my package manager, so maybe that will fix it20:48
=== khmarbaise_ is now known as khmarbaise

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!