You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Blair Zajac <bl...@orcaware.com> on 2008/03/14 15:27:01 UTC
Broken merge conflict resolution for symlinks
I ran into some broken behavior for conflict resolution for symlinks. Opened
ticket here to mark it
http://subversion.tigris.org/issues/show_bug.cgi?id=3123
I didn't do comprehensive testing if you merge in a change to/from a symlink
from/to a file or directory.
Blair
--
Blair Zajac
CTO, OrcaWare Technologies
<bl...@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: 1.5: Broken merge conflict resolution for symlinks
Posted by Karl Fogel <kf...@red-bean.com>.
Blair Zajac <bl...@orcaware.com> writes:
> I don't think we should have people editing the representation for a
> symlink. If there's a conflict, let them pick one.
Well, keep in mind that editing the representation directly was, when we
introduced the whole svn:special thing, an intended use case for
platforms that don't support symlinks (e.g., most Windows).
The idea was you could check out a working copy on a platform with no
symlinks, and still, if absolutely necessary, commit a change to one
(thus making a build succeed again, winning the accolades of your
manager, saving the company, making millions of dollars, and retiring to
Duluth, Minnesota to tend to your ailing ferret).
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: 1.5: Broken merge conflict resolution for symlinks
Posted by Blair Zajac <bl...@orcaware.com>.
Karl Fogel wrote:
> Blair Zajac <bl...@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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: 1.5: Broken merge conflict resolution for symlinks
Posted by Karl Fogel <kf...@red-bean.com>.
Blair Zajac <bl...@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...
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
1.5: Broken merge conflict resolution for symlinks
Posted by Blair Zajac <bl...@orcaware.com>.
Re'ccing so other developers see this.
Should we put this ticket into 1.5?
Blair
Blair Zajac wrote:
> I ran into some broken behavior for conflict resolution for symlinks.
> Opened ticket here to mark it
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=3123
>
> I didn't do comprehensive testing if you merge in a change to/from a
> symlink from/to a file or directory.
>
> Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org