(inconsistency) Merge of "

http://subversion.tigris.org/issues/show_bug.cgi?id=2501







------- Additional comments from vstarretigris.org Mon Feb 13 18:27:55 -0800 2006 -------
In general, my feelings are that svn:keywords expansions
should always be
un-expanded before svn does any operation on files involving
a comparison, such
as a merge or update. This un-expansion should of course be
based on the
properties within each related revision, not just one or the
other.
Due to the fact that it works on "text" files, I
would guess that someone
specifically told SVN to not un-expand keywords in binary
files before
comparing. This seems outright wrong to me. While SVN should
not attempt to
guess how to merge changes into a binary file, it should
feel free to do
whatever it wants to sections of the file which SVN has been
explicitely told to
modify.
That is to say: There is no safty gained from modifying the
file in one
situation (checkout or update) but not modifying the file in
one specific
situation (merge).

If you want to disallow subversion from making any
modifications to files it
thinks are binary, that's one thing. Simply deciding not to
modify a file in one
specific case while modifying it in every other case is
inconsistent and can't
really serve a purpose other than to generate complaints.

It may be philisophical, but I think that if "svn
status" thinks the files are
unmodified, "svn merge" should also think the
files are unmodified.
(modification of the svn:keywords properties may count in
some situations too,
of course, the specifics of /that/ may be up for some
debate)

------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org