=== AfC1 is now known as AfC [12:21] jelmer: sup, where are you? [12:21] ronny, hey [12:22] ronny, sitting next to Wouter in front of the stairs on the second floor [12:23] oh, last time i ran across him you wherent around, i'll be right there [12:38] how can I push tags ? [12:39] AnAnt: tags should be pushed when you push a branch [12:40] ok, thanks [15:01] I created a new directory, done 'bzr init' there, pulled my latest branch/commits in, copied/pasted my modified files, commited and am getting an error on pushing. [15:01] http://paste.pocoo.org/show/159911/ [15:02] I'm doing this because of "diverged branch" errors I'm getting, and doing conflict/resolved put all these "markers" in my python files [15:12] hmm, I may have fixed it. [15:13] done bzr branch instead of init/pull [15:15] phew yup that fixed it [15:15] * sproaty wipes the sweat away [15:17] sproaty: "bzr init" uses the default format, and the current one is incompatible with lp:~sproaty/whyteboard/development's format. "bzr branch" uses the same format as the soruce branch. [15:17] ah I thought so [15:18] I think I started to get this whole branches are diverged after committing to one branch, uncommiting and then pushing the old commit to another branch [15:20] sproaty: All "branches are diverged" means is that both branches contain some revisions that the other does not. [15:21] sproaty: This obviously has to be resolved with "merge" (or "uncommit" if you want...) before you can push and pull between them again. [15:22] Peng, I wasn't sure whether to trust merge, plus I played around a bit (after backing up my newly changed files) and it stuck all this <<<<<<< sproaty: Those are conflicts, because both sides changed the same thing. [15:39] sproaty: Merge is perfectly "trustworthy". I mean, the worst that can happen is it does something annoying and you have to revert. [15:40] ah, so the changes it makes are "undoable" [15:40] sproaty: All changes in the working tree can be undone. [15:42] Peng, good to hear [15:48] sproaty: Even if they weren't, you could just branch a new copy and rm -rf the original. [15:49] glad it's all fixed now, anyway :) [17:37] jelmer: Hi - how should I submit changes to bzr-rewrite? The branch on Launchpad asks that people not submit MPs there. [18:38] hi! I want to deploy a bazaar repository which is accessed with bzr serve [18:39] I want to create a server side hook or something which will check the signatures when ever a push or commit from checkout happens [18:39] and if the revisions are not signed or verifying the signatures fails the push must be rejected [18:40] I made i quick test just to notice that pre_commit hook is not run on push [18:40] and there's no pre_push hook [18:41] I'll start looking thourgh the bzr code later, but I wanted to ask if someone has some tips or pointers where to look [18:48] I've only looked at the hooks section of the user reference and only hook that looks promising is pre_change_branch_tip, but I don't know yet whether or not it can provide access to the revision signatures and is there any way to prevent the change from happening [18:49] but I'm optimistic :) [19:12] I could do this kind of server side verification with pqm, no? [19:44] am I right in thinking "bzr init --append-revisions-only" basically means you can't use commands like uncommit? [20:02] Pilky: Probably. Of course, you *can* turn append_revisions_only off, and then do whatever the hell you want. :D [20:02] heh, just wondering what it does [20:02] there's a few options that aren't very well explained in help docs [21:44] Yes! I can access the new revisions on server side during a push in pre_change_branch_tip hook and reject the push if needed by raising some exception [21:44] sweet! :) === khmarbaise_ is now known as khmarbaise [22:27] <__monty__> How do I checkout bzr.dev? [22:34] __monty__: You can use: bzr branch lp:bzr [22:36] <__monty__> I guess I need the ip adress of the repository for that? I tried "bzr branch http://bazaar-vcs.org/bzr/bzr.dev/ bzr.dev" and it gives me "ERROR: Not a branch: ..." [22:40] <__monty__> jkakar? [22:40] <__monty__> jkakar ? [22:41] __monty__: Hi. :) [22:41] __monty__: 'bzr branch lp:bzr' is all you need. [22:41] __monty__: wgrant is right. Also, the space between the http://... and the bzr.dev is a problem in the command you tried. [22:42] * jkakar steps away [23:26] <__monty__> Thanks for the help guys, :-)