Re: Tree Conflicts and User Interface (was: Re: [PATCH] Tree-conflicts: do_entry_deletion segfault)

On Fri, Sep 12, 2008 at 01:57:53PM +0200, Stefan Sperling wrote:
> There are certain types of conflicts that require an additional
> merge to be resolved, such as when a textdelta is applied to a file
> which is not yet present in the target branch -- the fix is to
> *repeat* the merge with a wider revision range, this time including
> the revision in which the file was created on the source branch.

I just realised that this is wrong.
The merge cannot simply be repeated.

Because of merge tracking, the file addition would be merged,
but the textdelta would not be merged again.
So the final merge result would miss the textdelta,
unless the user reapplied it manually.

Damn, this is really complicated stuff we're dealing with :/

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-12 14:34:47 CEST