Foreign characters converted to unicode using merge wizard

oyvind · Post by **oyvind** » Wed Sep 19, 2007 4:01 am

I am testing Fortress 1.0.4, but I assume the version control part is Vault.

I used Tools -> Merge Branches.

Trunk before branch:
Hei på deg
--------------------------

Then I created two branches

Trunk branch:
Test edting
Hei på deg
--------------------------

Bugfix branch:
Hei på deg
This is a fix
--------------------------

After merge with origin bugfix to turnk the file in the trunk becomes:
Test edting
Hei pÃ¥ deg
This is a fix
--------------------------

Which is correct except for the fact that å is converted to unicode. Is there some option I can tweak to get it to store original ascii and not convert?

GregM · Post by **GregM** » Wed Sep 19, 2007 10:51 am

I had this same problem. They tell me that it's been fixed in 4.0.5. It only happens when you use the automatic merge. It doesn't happen when you use the merge tool from Show Merge.

oyvind · Post by **oyvind** » Wed Sep 19, 2007 12:52 pm

Ok - couldn't find anything about the topic using the forum search.

When is 4.0.5 due? We need a new version control soon and this is pretty much a deal breaker for us.

Cannot have a merge which corrupts source

Post by **jeremy_sg** » Wed Sep 19, 2007 3:06 pm

oyvind and greg,

4.0.5 is in the final stages of testing, and we're hoping to get it out in the next few weeks. If this bug is causing you pain, oyvind, I'll offer you the same thing I offered Greg, which is a pre-release build of 4.0.5 that should fix this issue.