`bzr resolve --take-this` clears x-bit on win32

[Alexander Belchenko]

While merging qbzr series branches back to trunk I very often got dumb conflicts in files where version info changed (__init__.py, setup.py, installer.iss). Most of this conflicts could be easily resolved with `bzr resolve --take-this` because in trunk I want to keep trunk's version info.

But it seems that `resolve --take-this` doesn't play well on Windows re x-bit support. On Windows x-bit should be preserved for all operations, which is done somewhere deep inside TreeTransform I suppose as a special hack. But resolve does not follow the same approach:

C:\work\Bazaar\plugins\qbzr>bzr resolve setup.py --take-this
1 conflict(s) resolved, 3 remaining

C:\work\Bazaar\plugins\qbzr>bzr st setup.py
modified:
  setup.py*
2 shelves exist. See "bzr shelve --list" for details.

C:\work\Bazaar\plugins\qbzr>bzr diff setup.py
=== modified file 'setup.py' (properties changed: +x to -x)

Please note that I didn't change x-bit manually neither in working copy, nor in source branch. That x-bit change never happens when I resolve conflict manually by editing the file in my editor.

[Alexander Belchenko (bialix)]

That's annoying behavior. Although `bzr revert setup.py` rather than `bzr resolve --take-this` does the right job.

[Alexander Belchenko (bialix)]

I suppose `bzr resolve --take-other` affected too.