Re: Conflict handling on merge-range application

Garrett Rooney wrote:
> On 7/12/06, Daniel Berlin <dberlin@dberlin.org> wrote:
>
>> Uh, so, imagine their had been no two merges, but you had merged the
>> already-merged revision.
>>
>> The conflicts in this merge may have come from any single revision
>> change, but the end result will still represent them all.
>>
>> Why do you think we should do something different just because we've
>> elided a revision in the middle?
>
> Well, mainly beacuse we don't currently handle merging into a
> conflicted file sanely. As dlr already mentioned, overlapping
> conflict markers don't work, etc. If you want to make that work then
> fine, but honestly I still think the idea of merging into an already
> conflicted file is kind of strange.

I agree that if your conflicts overlap, it might be strange.

Otherwise, i don't think so.

I'm willing to start somewhere, and say we abort merges if we hit
overlapping conflicts.

However, I do believe we are going to get significant user pushback on this.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 12 21:41:13 2006