Scott Aron Bloom schrieb:
That's very interesting to me, would you share this patch with me when
you adapted it?
I actually sent them code that solves this exact problem about 12 months
I do have a patch to qmake if anyone is interested, however, its not
4.X, though I probably need to update it, since I have moved to 4.X and
am now missing my fixed qmake... sigh
Would be great, thanks...
From: Daniel Walz [mailto:walz@xxxxxxxx]
Sent: Friday, May 26, 2006 5:18 AM
To: Qt Interest List
Subject: Re: [OT] Version control and Visual Studio project (XML) files?
Till Oliver Knoll schrieb:
today is Friday, the day for off-topic questions :) Sorry for being
_very_ OT, but this is an all-day problems question I'm sure others
have a quick solution handy...
We check-in the Visual Studio *.sln and *.vcproj files into Subversion
(SVN). This works fine as long as not two people have modified them at
the same time! If so, SVN merges the changes "correctly", but since
those are XML files the structure is broken most of the time and the
merged version becomes unreadable for Visual Studio!
A workaround would be check-in the XML files as binary data, but then
the changes of just one developer would survive - when the others
do a check-out first (necessary anyway before check-in) they loose
their changes they have done in the project (adding a source file, for
An even better workaround would be to have the issue N114852 fixed:
or non customers:
...so you would not need to save the solution in the SVN repository
because all information would be in the .pro files.
So the campaign: vote for it :-) (ok ok, it was me who wrote the
suggestion ;-) )
Dipl.-Ing. Daniel Walz - walz@xxxxxxxx
MeVis Technology GmbH & Co. KG - Development
To unsubscribe - send a mail to qt-interest-request@xxxxxxxxxxxxx with
"unsubscribe" in the subject or the body.
List archive and information: http://lists.trolltech.com/qt-interest/