You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Alexey Yudichev <ay...@newmail.ru> on 2006/01/12 08:51:10 UTC
Re[2]: Merge of deleted file with a modified one
> See issue 2282:
> http://subversion.tigris.org/issues/show_bug.cgi?id=2282
I know that merge that happens during "svn update" is different to the one
that happens during "svn merge". Does the enhancement 2282 include
improvement to the "svn merge" merging algorithm? The bug description
does not say anything about it.
> On 1/11/06, Alexey Yudichev <ay...@newmail.ru> wrote:
>> Dear developers,
>>
>> Are there any thoughts/plans on changing subversion behaviour when
>> merging a deletion to an existing file? Currently, subversion just
>> deletes the file even if it has got modifications since last merge point.
>> There have been a number of threads in users list, the last one being
>> http://svn.haxx.se/users/archive-2006-01/0318.shtml. Most of people
>> (well, all except one) agree that a conflict or a warning should be
>> raised in this case.
>>
>> In short, if I
>> 1) create a branch from trunk via svn copy
>> 2) delete a file in branch and commit
>> 3) modify the same file in trunk and commit
>> 4) merge branch to trunk
>> I get the file deleted. Which means I (silently) lose my changes made
>> in trunk.
>>
>> It is noticed in the mentioned thread that CVS and Perforce do raise a
>> warning/conflict in a similar case.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Re[2]: Merge of deleted file with a modified one
Posted by Ben Collins-Sussman <su...@red-bean.com>.
On 1/12/06, Alexey Yudichev <ay...@newmail.ru> wrote:
> > See issue 2282:
> > http://subversion.tigris.org/issues/show_bug.cgi?id=2282
> I know that merge that happens during "svn update" is different to the one
> that happens during "svn merge". Does the enhancement 2282 include
> improvement to the "svn merge" merging algorithm? The bug description
> does not say anything about it.
>
It's the same algorithm, for the most part. The only difference is
that 'svn merge' doesn't affect your text-bases, and 'svn update'
does. But that issue is meant to apply to both operations.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org