On Thu, Feb 15, 2007 at 09:21:24PM +0100, Lieven Govaerts wrote:
> Malcolm Rowe wrote:
> >Interestingly, this appears to cause special_tests 8 to XPASS. More
> >when I have a chance to look into why.
> Special test 8 is about merging the content of a file in a symlink, that
> seems like a special case of the issue your patch solves.
Right, so in test 8, we create a symlink and then merge into it a
content-change from a regular file. There's a merge conflict, so we now
end up with a symlink for the .working file, the regular files for the
.merge-left and .merge-right files, and a file with conflict markers
(and svn:special set) as the file under version control.
Previous to my change, the conflicted file couldn't be detranslated - we
got an error like:
svn: 'This is the file 'gamma'.
' has unsupported special file type ...
So, uh, is the behaviour described in the first para above correct? (and
so I should mark merge_tests 8 as fixed too), or should we actually be
testing for a particular behaviour (the current test just checks that
there's no error coming out of the merge, not that the merge does
anything in particular).
I'm leaning towards "this is weird, but probably correct behaviour". I
can't think of anything more reasonable that we should do, anyway :-)
Received on Fri Feb 16 10:59:33 2007
- application/pgp-signature attachment: stored