| === r0bby_ is now known as robbyoconnor | ||
| sumanah | I'm learning to use Bazaar and I need some help; I think I did 'bzr branch lp:mailman' to get a local copy of the dev branch of https://launchpad.net/mailman/3.0 , and then I pushed a branch https://code.launchpad.net/~sumanah/mailman/mailman , and now when I run `bzr update` it won't grab any revisions after my branch | 19:49 |
|---|---|---|
| Peng | I think you want bzr pull or bzr merge | 19:50 |
| Peng | not bzr update | 19:50 |
| sumanah | this was several weeks ago, checking out my .bash_history .... | 19:51 |
| sumanah | Peng: ah interesting! I was looking at http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/central_intro.html | 19:52 |
| sumanah | I'm trying bzr merge now, thanks Peng | 19:53 |
| sumanah | hmmm, I ran `bzr merge` (no argument, just to check) and although I got a sort of manifest of changes and "all changes applied successfully", bzr log still only goes up to revision 7274 (I know there have been more revs) | 19:55 |
| sumanah | and `bzr branches` just gives me '* (default)' | 19:56 |
| sumanah | 'bzr log --include-merged | head' also gives me rev7274 | 19:56 |
| Peng | sumanah: bzr status, bzr diff and bzr commit | 19:57 |
| fullermd | Merge doesn't make a new rev, it just stages up the merge. | 19:57 |
| fullermd | Presumably you'd really want to pull if you could, though if you're using the branch for local work you couldn't (well, wouldn't want to). | 19:57 |
| Peng | Mm | 19:58 |
| Peng | You can "bzr pull" if your branch is a subset of the remote branch. If you have revisions it doesn't, you have to merge. | 19:58 |
| sumanah | $ bzr pull | 20:02 |
| sumanah | Using saved parent location: http://bazaar.launchpad.net/~mailman-coders/mailman/3.0/ | 20:02 |
| sumanah | bzr: ERROR: These branches have diverged. Use the missing command to see how. | 20:02 |
| sumanah | Use the merge command to reconcile them. | 20:02 |
| sumanah | OK! That is what I will do | 20:02 |
| sumanah | Thank you Peng and fullermd, will work on that in an hour or so after this meeting :) | 20:02 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!