You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by sh...@gmx.at on 2007/02/06 15:01:33 UTC
Merging .resx files
Hi,
I searched a bit, but couldn't find a solution for a problem I'm experiencing with .resx files and branch merges.
.resx files are xml-files that stores resource information for VisualStudio projects. Unfortunately changes to this file are changing the sequence of the xml tags. So if I want to merge two branches I get a .resx file that contains the same information two times.
Is there any way to work around this problem?
--
Best regards,
Shevek
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merging .resx files
Posted by Steve Bakke <st...@amd.com>.
Our solution was to treat the file as binary by setting auto-props on *.xml
to be a binary mime-type.
-steve
On 2/6/07 10:18 AM, "Greg Thomas" <th...@omc.bt.co.uk> wrote:
> On Tue, 06 Feb 2007 16:01:33 +0100, shevek@gmx.at wrote:
>
>> .resx files are xml-files that stores resource information for VisualStudio
>> projects. Unfortunately changes to this file are changing the sequence of the
>> xml tags. So if I want to merge two branches I get a .resx file that contains
>> the same information tw
>> o times.
>>
>> Is there any way to work around this problem?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merging .resx files
Posted by Greg Thomas <th...@omc.bt.co.uk>.
On Tue, 06 Feb 2007 16:01:33 +0100, shevek@gmx.at wrote:
>.resx files are xml-files that stores resource information for VisualStudio projects. Unfortunately changes to this file are changing the sequence of the xml tags. So if I want to merge two branches I get a .resx file that contains the same information tw
>o times.
>
>Is there any way to work around this problem?
There is a suggested enhancement that would allow svn to have
filetype-specific merging functionality ("pluggable client-side diff
programs" at http://subversion.tigris.org/roadmap.html) but until that
comes along, svn won't be able to do anything cleverer than a
plain-text merge.
However, TortoiseSVN will (for example) do something clever if you
diff two MS-Word files using the MS-Word diff functionality. It may be
that if you ask the same question on the TSVN mailing list, there may
be a way of being a bit cleverer if you can find a XML-aware
diff/merge utility.
Greg
--
This post represents the views of the author and does
not necessarily accurately represent the views of BT.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org