Am 28.10.2011 11:55, schrieb Flemming Frandsen:
> We're having a major problem with subversion, it seems that for some
> changesets svn merge will do a different change than svn diff would
> suggest.
It took me a while of scrolling up and down to find the difference, but
IIUC the problem is A) that there is a conflict and B) that the added
code contains the stuff following the "addLOVValueIDs" comment.
A few things I noticed:
- In trunk, the text was added to the end of the file, while in the
branch it seems to have been merged into the middle somewhere. Question
is where should it have been applied? You might be hitting some
limitations of the merge algorithm here, too.
- You mentioned that you have clients on different OS families. I know
that SVN is a bit picky when things like line endings differ between
source and target of a merge. I've repeatedly had whole files that were
reported as conflicting because of that. If the line endings are even
mixed within a file, different, unpleasant things could happen. In my
case it was caused by setting svn:eol-style in the trunk and then
merging to the branch without svn:eol-style.
- Another way to mess with lineendings is to check out on one system and
then use that working copy on another. Typically that happens when
putting the WCs on a shared directory or when using it with Cygwin and
MS Windows.
> I did not find any --dont-merge-random-crap option, so I'm very confused.
How confused would you be if you had found that option? ;D
Uli
**************************************************************************************
Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at http://www.dominolaser.com
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
Received on 2011-10-28 12:28:51 CEST