[07:57] morning all! === yofel_ is now known as yofel [12:37] hi [12:38] hi http://wiki.bazaar.canonical.com/BzrPlugins <- the rebase plugin link is dead [12:42] noob question: i'm missing some revision in my local repo, bzr tells me I can reconcile the branches using merge... but merge don't allow me to do it because of changes made in my repo [12:42] what's the good way to solve this ? [13:07] nabz: commit your local changes first, then merge, then continue [13:08] AfC: the problem is that when i try to merge my local changes, bzr adds all the file in missing revisions [13:09] AfC: *to commit my local changes, sorry [13:09] um [13:09] I'm not sure what you did. You could always `bzr revert` those adds [13:10] nabz: bzr is absolutely doing the right thing. The problem is you've asked it to do something in a strange order [13:10] nabz: I'd go back to figuring out how you got "missing revisions" and then not do that again [13:11] But in general, if you're doing an operation that results in things you don't want, bzr revert those changes. [13:11] then commit [13:12] don't revert erases all the changes in the local repo ? [13:12] for the listed files, yes [13:12] you just said you didn't want the changes [13:12] whatever [13:13] Sorry, some one else is going to have to help you. I'm not sure how you've boxed yourself into this corner. You're doing something strange. Did you do `uncommit` perhaps? Or a pull --overwrite maybe? [13:13] Regardless [13:13] i don't want the changes coming from the trunk, but i want to keep what i've changed so i can commit them [13:13] don't know [13:14] i think i'll make another clean branch and set my changes in it... [13:14] thanks for you help === deryck is now known as deryck[afk] === deryck[afk] is now known as deryck === lifeless_ is now known as lifeless