[02:35] Hello everyone, how can I remove all local changes and make my local branch identical to the most updated launchpad "parent"? [02:38] bzr pull --overwrite [02:43] Also, bzr revert [02:44] (Depending on what you mean by local changes) [03:38] 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:39] sounds like you're conflating two things [03:39] 'pull --overwrite' makes your branch history match the remote [03:40] 'revert' makes your checkout match the branch head [03:41] 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:50] Meatball_py: pull --overwrite; revert [05:57] lifeless: thx :) [10:03] 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:19] 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] jelmer might know more, but I thought he worked on a default-commit-message hook [10:20] 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. [11:14] xnox: I do see bzr exposing a 'set_commit_message' hook, and bzr-builddeb ties into that hook [11:14] http://bazaar.launchpad.net/~bzr-builddeb-hackers/bzr-builddeb/trunk/view/head:/__init__.py [11:14] I don't know what versions, etc. [11:14] (looks like you need bzr >= 2.4) [11:15] jam: debian/changelog works correctly, "GNU project style" /ChangeLog do not however. [11:21] 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] I misunderstood the original question. [11:22] =( /me thought there was one..... I see.... === fredp is now known as fredp|faraway === fredp|faraway is now known as fredp [12:42] Hi jam, Xbox [14:35] xnox: there was one I thought [14:35] xnox: but perhaps I'm thinking of the log --format=gnu thing instead [14:39] lifeless: yeah, there is log =) i want the reverse ;-) === slank_away is now known as slank [15:14] Hi ! I have a question regarding bzrEclipse. Is it the right place to ask it ? [16:18] 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:32] bzr uncommit ? [16:33] LeoNerd: hmm… I forgot about uncommit. Thanks! [16:33] It's the reverse of commit, see.. ;) [16:34] It was the first alias I added when I had to start using git; I've forgotten some of my base bzr === yofel_ is now known as yofel === carif_ is now known as carif