Re: [PATCH] V2, diff preview without text deltas

Ben Collins-Sussman wrote:
>
> On Aug 12, 2005, at 12:07 PM, Martin Hauner wrote:
>
>>
>> Unsolved problem
>> ----------------
>>
>> The open_file slot in the diff editor is called for files that are
>> not changed (a diff shows no text differences). These files don't
>> show up in a normal diff.
>>
>> It looks like this has something todo with merging.
>>
>> After creating a branch from trunk and merging several files from
>> trunk to that branch (making the files on the branch and trunk equal
>> again (text content)) they appear in a diff preview between the
>> branch and trunk.
>
>
>
> Can you show us a transcript which demonstrates this? So we can all
> reproduce and examine what's going on?

Here we go:

the output of svn where interesting is prefixed with "> ", comments start
with #. I hope it is not too confusing :)

-----snip---------------------------------------------------------------
svn admin create preview
svn co file:///d:/dev/src/subcommander/preview pwc
cd pwc
svn mkdir trunk
svn mkdir branches
svn ci -m "created layout"
svn up
cd trunk
touch CHANGES
svn add CHANGES
svn ci -m "added CHANGES"
svn up
svn cp file:///d:/dev/src/subcommander/preview/trunk
file:///d:/dev/src/subcommander/preview/branches/0.1.x -m "created branch"
> <no output>
svn diff -p file:///d:/dev/src/subcommander/preview/branches/0.1.x
file:///d:/dev/src/subcommander/preview/trunk
> <no output>
cd trunk
echo 'strange!' >> CHANGES
svn ci -m "modified CHANGES"
svn up

# now lets take a look at the diff and the diff preview:

svn diff file:///d:/dev/src/subcommander/preview/branches/0.1.x
file:///d:/dev/src/subcommander/preview/trunk
> <a diff with the modification to the CHANGES file>
svn diff -p file:///d:/dev/src/subcommander/preview/branches/0.1.x
file:///d:/dev/src/subcommander/preview/trunk
> M CHANGES

# ok it looks good so far, now lets merge the modification into the branch

cd ../branches/0.1.x
svn up
svn log file:///d:/dev/src/subcommander/preview/trunk
> ------------------------------------------------------------------------
> r4 | martin | 2005-08-14 15:06:36 +0200 (So, 14 Aug 2005) | 1 line
>
> modified CHANGES
> ...
svn merge -r3:4 file:///d:/dev/src/subcommander/preview/trunk .
> U CHANGES
svn ci -m "merged r4"
svn up

# lets take another look at the diff and the diff preview:

svn diff file:///d:/dev/src/subcommander/preview/branches/0.1.x
file:///d:/dev/src/subcommander/preview/trunk
> <no output>

# looks good again

svn diff -p file:///d:/dev/src/subcommander/preview/branches/0.1.x
file:///d:/dev/src/subcommander/preview/trunk
> M CHANGES

# ups.. that's unexpected here. Looks like the open_file method of the
# diff preview editor was called.
-----snip---------------------------------------------------------------

Is this to be expected? And if so how do i recognize it so i can filter
those files?

-- 
Martin
Subcommander, http://subcommander.tigris.org
a cross platform Win32/Unix/MacOSX subversion gui client & diff/merge tool.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org