[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: "<filename> created independently by second party"

From: Derek Robert Price
Subject: Re: "<filename> created independently by second party"
Date: Thu, 09 Oct 2003 17:46:19 -0400
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030624 Netscape/7.1

Hash: SHA1

Larry Jones wrote:

| As far as CVS knows, the two file have nothing whatsoever to do with
|each other.  Without a common ancestor, there's nothing to merge --
|you'd just have one big conflict with the entire contents of both files,
|so there's no point in even trying.

Well, there are at least three points:

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.

2.  Users would have less to learn since the merge markers would mean
just what they meant everywhere else and this question wouldn't need to
be in the FAQ and asked as often as it is.  :)

3.  There is a similar message generated after a join from a branch
where the file was added to another where it was added separately, and
this information can be lost after a simple touch.  In this case,
putting the merge markers in would prevent that lost information.

Of course, I don't have time to write the patch myself.  I'm just always
hopeful that someone will be inspired by my extraordinary insights!  ;)


- --
~                *8^)

Email: address@hidden

Get CVS support at <>!
- --
I wouldn't bring up Paris right now.  It's poor salesmanship.

       - Humphrey Bogart as Rick, _Casablanca_
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Netscape -


reply via email to

[Prev in Thread] Current Thread [Next in Thread]