We recently moved to Subversion from VSS, using a script (VSS2SVN, I
believe). This created a repository in which we have a number of
branches that have no SVN history of being copies of the trunk. The hit
of having to coddle the merging of these branches back into trunk as
they go for release is understandable, but we're seeing issues with
conflicts that don't make complete sense, and I'm hoping someone can
confirm my suspicions or set me straight as to what the problem is and
how to fix it.
The situation we're seeing is that we are merging the unlinked (no
historical copy from trunk) branch back to trunk and we see conflicts
where the files are actually identical or contain trivial changes(as in
no changes occurred in the merge-to target) in a tool such as
TortoiseSVN. When we look at these "conflicted" files, what we see is
that they whenever they have been edited and commited post-VSS
conversion, every line is shown as having been deleted and then
re-added, with the difference being that the VSS version has CRLF eol
markers and the next version has LF eol markers.
We've set all our clients (we work on both Windows and Linux) to native
eol, but what appears to have happened is that the original import
somehow preserved the Windows eol markers from the VSS repo. Now, when
we make a change, SVN converts the entire file to Unix eols and then its
internal diff defines that commit as conflicting in all circumstances.
My concern is that merging will continue to produce a long list of
unresolved conflicts when it shouldn't actually need any manual effort.
How should I fix this? Is there any way to get SVN to convert all the
files internally, or preferably to ignore eol issues when doing diffs?
Thanks for any help,
Homechoice is a trading name of Video Networks Limited of 205 Holland Park Avenue, London W11 4XB and registered in England and Wales (No. 2740910).
This email may contain confidential and privileged information and is intended for the named or authorised recipients only. If you are not the named or authorised recipient of this email, please note that any copying, distribution, disclosure or use of its contents is strictly prohibited. If you have received this email in error please notify the sender immediately and then destroy it. The views expressed in this email are not necessarily those held by Video Networks Limited and we do not accept any liability for any action taken in reliance on the contents of this message. We do not guarantee that the integrity of this email has been maintained, nor that it is free of viruses, interceptions or interference.
This email has been scanned for all known viruses by the MessageLabs Email Security System.
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Mon Jan 29 21:29:10 2007