On Thursday 14 October 2004 10:46, Simon Large wrote:
> Please excuse my butting in on this thread, but I would like to point
> out that text files which are normally mergeable can sometimes be
> modified in hard-to-merge ways. I can give you a case in point from a
> couple of days ago:
>
> The TSVN documentation is in XML and normally changes can be merged
> efficiently and easily. However, over a period of time the indentation
> had become completely messed up, and some of the text required
> re-wrapping to fit a sensible width.
...
> Sorry, no solutions, only problems. Just pointing out that mergeable
> files ain't necessarily so.
IMO the problem is that
> text files which are normally mergeable can sometimes be
> modified in hard-to-merge ways.
But that depends entirely on the merge-tools.
Your example given I'd expect the file to have a mime-type of text/xml (or
some such) and then svn should do the merge by using a special program for
xml.
(In the simplest case, drop all whitespace, merge them afterwards, and
re-insert whitespace on the right positions - like the various
auto-indentation-tools do)
So, to get back to your original end-statement:
> Just pointing out that mergeable
> files ain't necessarily so.
To be honest, I'd believe even tiff-pictures to be mergeable using the correct
algorithms and programs - eg. by dumping them in ppm(5) format with every
pixel on its line ...
Regards,
Phil
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 14 11:57:02 2004