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

Re: 1.5: Broken merge conflict resolution for symlinks

From: Blair Zajac <blair_at_orcaware.com>
Date: Sun, 23 Mar 2008 21:29:35 -0700

Karl Fogel wrote:
> Blair Zajac <blair_at_orcaware.com> writes:
>> Re'ccing so other developers see this.
>>
>> Should we put this ticket into 1.5?
>
> I don't feel this is a 1.5-stopper. Interactive conflict resolution
> highlights the problem, but the problem predates 1.5 (it could happen
> with just conflict markers, for example).
>
> Of course it would be nice to solve the bug :-). Maybe for svn:special
> files, we should:
>
> a) tolerate a newline at the end of the first (and only) line
>
> b) add the newline to both sides of the merge at merge time (if the
> newline isn't already present, that is)
>
> Beyond that, I'm not sure there's much we can do. If people edit a file
> to have a bogus path, then the symlink is going to be broken. We could
> provide special editing checks for this case in interactive conflict
> resolution, but I'm not sure it's worth it...

I don't think we should have people editing the representation for a symlink.
If there's a conflict, let them pick one.

Agreed that this is not a regression since 1.4.

There's actually 3 separate issues in that bug.

Blair

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-24 05:36:45 CET

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