| === AfC1 is now known as AfC | ||
| ronny | jelmer: sup, where are you? | 12:21 |
|---|---|---|
| jelmer | ronny, hey | 12:21 |
| jelmer | ronny, sitting next to Wouter in front of the stairs on the second floor | 12:22 |
| ronny | oh, last time i ran across him you wherent around, i'll be right there | 12:23 |
| AnAnt | how can I push tags ? | 12:38 |
| jelmer | AnAnt: tags should be pushed when you push a branch | 12:39 |
| AnAnt | ok, thanks | 12:40 |
| sproaty | 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 |
| sproaty | http://paste.pocoo.org/show/159911/ | 15:01 |
| sproaty | 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:02 |
| sproaty | hmm, I may have fixed it. | 15:12 |
| sproaty | done bzr branch instead of init/pull | 15:13 |
| sproaty | phew yup that fixed it | 15:15 |
| * sproaty wipes the sweat away | 15:15 | |
| Peng | 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 |
| sproaty | ah I thought so | 15:17 |
| sproaty | 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:18 |
| Peng | sproaty: All "branches are diverged" means is that both branches contain some revisions that the other does not. | 15:20 |
| Peng | sproaty: This obviously has to be resolved with "merge" (or "uncommit" if you want...) before you can push and pull between them again. | 15:21 |
| sproaty | 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 <<<<<<<<TREE stuff into my files | 15:22 |
| Peng | sproaty: Those are conflicts, because both sides changed the same thing. | 15:39 |
| Peng | sproaty: Merge is perfectly "trustworthy". I mean, the worst that can happen is it does something annoying and you have to revert. | 15:39 |
| sproaty | ah, so the changes it makes are "undoable" | 15:40 |
| Peng | sproaty: All changes in the working tree can be undone. | 15:40 |
| sproaty | Peng, good to hear | 15:42 |
| Peng | sproaty: Even if they weren't, you could just branch a new copy and rm -rf the original. | 15:48 |
| sproaty | glad it's all fixed now, anyway :) | 15:49 |
| maxb | jelmer: Hi - how should I submit changes to bzr-rewrite? The branch on Launchpad asks that people not submit MPs there. | 17:37 |
| Wellark[] | hi! I want to deploy a bazaar repository which is accessed with bzr serve | 18:38 |
| Wellark[] | 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 |
| Wellark[] | and if the revisions are not signed or verifying the signatures fails the push must be rejected | 18:39 |
| Wellark[] | I made i quick test just to notice that pre_commit hook is not run on push | 18:40 |
| Wellark[] | and there's no pre_push hook | 18:40 |
| Wellark[] | 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:41 |
| Wellark[] | 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:48 |
| Wellark[] | but I'm optimistic :) | 18:49 |
| Wellark[] | I could do this kind of server side verification with pqm, no? | 19:12 |
| Pilky | am I right in thinking "bzr init --append-revisions-only" basically means you can't use commands like uncommit? | 19:44 |
| Peng | Pilky: Probably. Of course, you *can* turn append_revisions_only off, and then do whatever the hell you want. :D | 20:02 |
| Pilky | heh, just wondering what it does | 20:02 |
| Pilky | there's a few options that aren't very well explained in help docs | 20:02 |
| Wellark[] | 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 |
| Wellark[] | sweet! :) | 21:44 |
| === khmarbaise_ is now known as khmarbaise | ||
| __monty__ | How do I checkout bzr.dev? | 22:27 |
| jkakar | __monty__: You can use: bzr branch lp:bzr | 22:34 |
| __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:36 |
| __monty__ | jkakar? | 22:40 |
| __monty__ | jkakar ? | 22:40 |
| jkakar | __monty__: Hi. :) | 22:41 |
| wgrant | __monty__: 'bzr branch lp:bzr' is all you need. | 22:41 |
| jkakar | __monty__: wgrant is right. Also, the space between the http://... and the bzr.dev is a problem in the command you tried. | 22:41 |
| * jkakar steps away | 22:42 | |
| __monty__ | Thanks for the help guys, :-) | 23:26 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!