[17:38] <lduros> i've made changes I haven't committed, and I want to get back to the last commit, that is, remove all changes i've done that are not committed
[17:38] <lduros> how do I do that?
[17:38] <lduros> sort of like git stash, but really I don't need to keep those changes. I want to get rid of them
[17:39] <lduros> so i don't know if shelve is what I want
[17:42] <lduros> I guess maybe bzr reset HEAD
[17:43] <lduros> bzr revert
[17:43] <lduros> I'm confused
[17:44] <lduros> just "bzr revert" seems to get back to the last commit
[17:45] <wilx> Indeed.
[22:05] <clausen> is there a way to get "bzr push" to fail when the local repo is behind the remote one?
[22:05] <vork> Behind? Surely in that case push has nothing to do.
[22:05] <clausen> yes, it has nothing to do
[22:05] <clausen> but I want an error
[22:05] <clausen> to tell me I need to pull
[22:05] <vork> Right.
[22:05] <clausen> is there a way I can ask it?
[22:06] <vork> I don't know, I'm new.
[22:06] <clausen> ok, thanks :)
[22:10] <fullermd> I'm pretty sure there's no way (I mean, short of hacking it up yourself) to make push do that.
[22:10] <clausen> ok, I guess I just have to do a bash alias then
[22:10] <fullermd> The general answer would be something like "check missing".  That would require you to check though.
[22:13] <fullermd> It's possible you could write a plugin that would hook in somewhere in the process; I don't know if there's an easily accessible limb to grab.
[22:13] <fullermd> (but that wouldn't change anything essential from the "hack the main codebase" case; just make it more modular)
[22:14] <clausen> here's my solution, for what I want:
[22:15] <clausen> alias bzrsync="bzr pull && bzr push"
[22:20] <clausen> this is a subtle difference from git, btw
[22:20] <vork> Oh?
[22:21] <vork> Ah, git-push succeeds only when the remote is pointing to the same commit as your current branch.
[22:21] <clausen> yes
[22:21] <clausen> I like git's behaviour, because it's easy to find out if everything is in sync
[22:22] <clausen> bzr needs two commands
[22:22] <clausen> (push and pull)
[22:22] <vork> I wonder if there's anything like "hg incoming" for bzr.
[22:22] <fullermd> That's half of missing.
[22:23] <clausen> fullermd, oh, ok
[22:23] <clausen> thanks!
[22:24] <clausen> (missing does something that "git push" does not?)
[22:24] <fullermd> Well, yes, but I was responding to vork    ;)
[22:25] <clausen> ok :)
[22:42] <vork> I like the way qdiff collapses feature branches.