Concerning Merge conflict but file has no chan
Srilakshmanan, Lakshman wrote on 18 Sep 2008, 17:22, at least in part:
> Hi All,
>
> I am experiencing a strange behaviour in svn 1.4.6 during a merge
> operation.
>
> 8 files out of 186 files are flagged as in conflict.
>
> Performing a svn diff (working base & working copy) on a conflicted
> file results in a message ** The selected files are identical **.
>
> All other files have been updated correctly.
>
> It is possible there is some peculiarity with the 8 files identified,
> but I am unable to put my finger on it.
>
> If anyone has experienced a similar issue, I will be interested to
> hear from you.
>
> Please feel free to provide any suggestion you may have.
"Metadata" of these files changed, e.g. svn: properties;
different types of line endings (CR, LF, CR+LF) which your diff tool
(is set to) ignore(s);
the very same changes were made in the files in both your working
copy and comitted from another working copy. I have experienced
conflicts in this case though more often (well, this scenario does
not happen that frequently) it's just a merge. Probably depends on
the SVN version.
Jan hendrik
---------------------------------------
Freedom quote:
Our inheritance of well-founded, slowly conceived codes of honor,
morals, and manners, the passionate convictions which so many hundreds
of millions share together of the principles of freedom and justice,
are far more precious to us than anything which scientific discoveries
could bestow.
-- Sir Winston Churchill
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-18 11:51:55 CEST