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

RE: Merging MFC generated resources

From: Ulrich Eckhardt <Eckhardt_at_satorlaser.com>
Date: 2006-01-23 14:44:42 CET

Caerwyn Pearce wrote:
> 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.
> Does anyone have any smart solutions to this or are
> there any clever merge tools which cope with #define
> lists well?

I know the problem here, too, but in my experience it
is usually just a communication problem between
developers. When those occur though, I usually simply
discard one part of the changes and start the compiler.
When an ID is missing, it will complain and I can
easily add it. The point is that you don't need to
merge, you only need to add symbols and give each one
a unique number.

Other than that, maybe locking the files via SVN might


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 23 14:49:33 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.