[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Merging MFC generated resources

From: Caerwyn Pearce <Caerwyn.Pearce_at_ffei.co.uk>
Date: 2006-01-23 14:00:15 CET


Subversion server version 1.2.3 on Linux

Svn client 1.2.3

Tortoise 1.3

Windows XP (but I wish it was a Mac!)




I'm looking for a little advice.


We're a fairly small team of developers. Most of our code merges
smoothly without too many conflicts but we have one or two applications
which are causing problems every time. They are the ones which are built
using Visual Studio and MFC, the dialog editor puts in new resources
incrementing the ids. If two or more developers add resources at the
same time then they get the same numbers. Not surprisingly, svn has a
great deal of difficulty merging this list. Even for a developer merging
a list of 100 resource IDs manually it's error prone and tedious.


The best solution so far is to allocate each developer an ID range, and
get him to manually set it in resource.h before he does any resource
edits. It works but it's a bit error prone.


Does anyone have any smart solutions to this or are there any clever
merge tools which cope with #define lists well?

Thanks in advance for any help anyone can offer.





Received on Mon Jan 23 14:02:34 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.