| Meatball_py | Hello everyone, how can I remove all local changes and make my local branch identical to the most updated launchpad "parent"? | 02:35 |
|---|---|---|
| lifeless | bzr pull --overwrite | 02:38 |
| spiv | Also, bzr revert | 02:43 |
| spiv | (Depending on what you mean by local changes) | 02:44 |
| Meatball_py | thank you. is there anyway to make the "local" branch exactly same as the remote branch? Even if I deleted some files or whatever. | 03:38 |
| bob2 | sounds like you're conflating two things | 03:39 |
| bob2 | 'pull --overwrite' makes your branch history match the remote | 03:39 |
| bob2 | 'revert' makes your checkout match the branch head | 03:40 |
| Meatball_py | but if I've already did a pull, then found there was something messed up. And I simply want to make everything same as the remote trunk, what should I do? | 03:41 |
| lifeless | Meatball_py: pull --overwrite; revert | 03:50 |
| Meatball_py | lifeless: thx :) | 05:57 |
| xnox | with bzr-bd bzr can pick up commit messages from diff of debian/changelog. Can it do the same but with diff of ChangeLog as the commit message "input" ? | 10:03 |
| jam | xnox: I want to say that if you do just "bzr commit" with newer versions of bzr and bzr-bd that does, indeed, work. | 10:19 |
| jam | jelmer might know more, but I thought he worked on a default-commit-message hook | 10:19 |
| xnox | I see. Doesn't seem to be working for me here locally. Oh, well. I guess i'll try to catch jelmer next time both of us are online. | 10:20 |
| jam | xnox: I do see bzr exposing a 'set_commit_message' hook, and bzr-builddeb ties into that hook | 11:14 |
| jam | http://bazaar.launchpad.net/~bzr-builddeb-hackers/bzr-builddeb/trunk/view/head:/__init__.py | 11:14 |
| jam | I don't know what versions, etc. | 11:14 |
| jam | (looks like you need bzr >= 2.4) | 11:14 |
| xnox | jam: debian/changelog works correctly, "GNU project style" /ChangeLog do not however. | 11:15 |
| jam | xnox: ah, right. So you can write a hook that does the same thing that bzr-bd does, but we don't have one at the moment. | 11:21 |
| jam | I misunderstood the original question. | 11:21 |
| xnox | =( /me thought there was one..... I see.... | 11:22 |
| === fredp is now known as fredp|faraway | ||
| === fredp|faraway is now known as fredp | ||
| jelmer | Hi jam, Xbox | 12:42 |
| lifeless | xnox: there was one I thought | 14:35 |
| lifeless | xnox: but perhaps I'm thinking of the log --format=gnu thing instead | 14:35 |
| xnox | lifeless: yeah, there is log =) i want the reverse ;-) | 14:39 |
| === slank_away is now known as slank | ||
| cykl | Hi ! I have a question regarding bzrEclipse. Is it the right place to ask it ? | 15:14 |
| bsd | Is there an equivalent in bzr for "git reset —soft" ?That forcibly changes the commit pointer for the current branch, but leaves the working tree unchanged | 16:18 |
| LeoNerd | bzr uncommit ? | 16:32 |
| bsd | LeoNerd: hmm… I forgot about uncommit. Thanks! | 16:33 |
| LeoNerd | It's the reverse of commit, see.. ;) | 16:33 |
| bsd | It was the first alias I added when I had to start using git; I've forgotten some of my base bzr | 16:34 |
| === yofel_ is now known as yofel | ||
| === carif_ is now known as carif | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!