Re: What's the best practice of such merge situation?

Thanks, Stefan.

Stefan Küng wrote:
>
> On 22.07.2010 12:08, albert kong wrote:
>> I have a MFC dialog project in the trunk and a branch, the branch
>> implement
>> some features to fulfill a client's unique request.
>> In the branch I edit so many in resource design. Now I add a paramount
>> function to the branch, both edit the dialog resource and code. I need to
>> integrate this change to trunk also, I found merge the resource file now
>> is
>> a disaster. I had to repeate the UI change again manually.
>> According your experience, what's the best design or practice in such
>> situation?
>> Hope I express it clearly!
>
> Merging the rc files is difficult at best. And if you're using VS2010
> then those files are stored in UTF-16 format which means svn will mark
> them as binary files and won't even attempt to merge them.
>
> Since merging those files is hard to do, we don't do it: in TSVN we
> don't merge changes back to the stable branch that have resource changes
> - not just because of the merging though, also because it would leave
> the translations with English strings.
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2637978
>
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe_at_tortoisesvn.tigris.org].
>
>

-- 
View this message in context: http://old.nabble.com/What%27s-the-best-practice-of-such-merge-situation--tp29235194p29262899.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2638062
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].