Re: Merging two different versions of a file does not mark correctly the differences between the files

On Nov 10, 2008, at 01:52, Bogdan Cristea wrote:

> I have already posted another thread with a similar topic, but
> the
> received answers were not satisfactory.
> What I am trying to do is to merge a tag with my working
> trunk. The merge
> operation is very difficult because between two versions, the
> entire file is
> marked as different, even if in reality only several lines differ.
> Also,
> using diff utility from Linux correctly gives the difference
> between the two
> files. I have attached a small example with this issue. Could
> someone explain
> what is wrong?
>
> I am using svn 1.5.4 compiled from sources on openSuSE 10.3 32 bits
>
> <tmp.tgz>

Your archive only contains two text files which differ in one line
(which, I agree, should be easily mergeable). Could you provide a
recipe, starting with "svnadmin create", that demonstrates the
problem with Subversion? Or attach the dump of a small repository
showing the problem, and the svn commands used to show the problem?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-10 23:20:57 CET