Mass uncommit, then what?

[Bob Tanner]

I downloaded upstream code into laptop:upstream, did bzr commit, did a push
to remote:upstream, went home. 

In desktop:my.branch (bzr branch of remote:upstream) I did a bzr merge, lots
of conflicts (thousands!) worked through a bunch and bzr resolve'd them.
Only to find upstream goofed and all files had goofy CRLF, CF in them. 

Did a bzr uncommit in laptop:upstream (nice feature!). Downloaded the fixed
upstream, into laptop:upstream, bzr commit, bzr push which had issues about
diverge, so I (mistakenly?) bzr push --overwrite the remote:upstream

To make sure things are "right" I did

unzip upstream.zip into upstream
bzr branch remote:upstream zzz
diff -uNr upstream zzz

No code difference (just bzr related)

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.

-- 
Bob Tanner <tanner at real-time.com>          | Phone : (952)943-8700
http://www.real-time.com, Minnesota, Linux | Fax   : (952)943-8500
Key fingerprint = AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288