[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: "<filename> created independently by second party"
From: |
Larry Jones |
Subject: |
Re: "<filename> created independently by second party" |
Date: |
Thu, 9 Oct 2003 19:29:15 -0400 (EDT) |
Derek Robert Price writes:
>
> 1. The files are likely to have a similar base given the similar name,
> as has been the case nearly every time I have encountered this problem
> myself, and we might be able to work out something with merging... if
> the diff between the two files is under a certain proportional size,
> then the diff could probably usefully be inserted into the file between
> merge markers for the user.
So you're proposing doing a 2-way diff in that case? As far as I know,
the existing diff code always does 3-way diffs, so that would probably
require quite a bit of infrastructure.
-Larry Jones
Oh yeah? You just wait! -- Calvin