[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: <cristeab_at_gmail.com>
Date: Mon, 10 Nov 2008 23:41:06 -0800

On Nov 11, 2008 12:20am, Ryan Schmidt <subversion-2008c_at_ryandesign.com>
wrote:
> 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
>
>
>
>
>
>
>
>
> 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?
>
>

I agree that this is not a good example. I cannot provide the entire
repository and it does not seem that this issue is easily reproducible. I
hope to find later some time to investigate this issue.

>
>
>
>
>
> ---------------------------------------------------------------------
>
> 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-11 08:41:52 CET

This is an archived mail posted to the Subversion Users mailing list.