Mass uncommit, then what?

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Bob Tanner wrote:
> Long background info, but the problem is I did the bzr merge in my
> desktop:my.branch when remote:upstream was full of "bad" files. So, my
> working directory has all the "bad" files plus a couple files I resolved
> plus all the changes I've made in desktop:my.branch.
> 
> How can I merge the remote:upstream (good files) into desktop:my.branch, not
> loose my local changes?
> 
> bzr merge says I have uncommited local change, which I do, but I don't want
> all of those changes, especially the "bad" CRLF files, only a few of the
> files I did edit.
> 
> This?
> 
> bzr commit few-file.cpp
> bzr commit few-other-file.cpp
> bzr merge
> 
> Any help would be greatly appreciated.

For the first thing, you should revert all the bad changes.  One way is
to shelve all the good changes, then revert, then unshelve.  Another way
is to commit the good files, then revert the bad files.

Next, you can commit.  This is optional.

Next, you merge.  If you didn't commit, you must specify --force.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFQX7r0F+nu1YWqI0RAmAXAKCEpU5jWXh6Oqko5EIfgN6WDZyllwCfe9KQ
fxcvpQrE/sjWP490HQM0L3c=
=ShJE
-----END PGP SIGNATURE-----