[Top][All Lists]

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

Re: import inconsistency

From: Derek Robert Price
Subject: Re: import inconsistency
Date: Tue, 10 Jun 2003 11:55:13 -0400
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02

Paul Edwards wrote:

"Derek Robert Price" <derek@ximbiot.com> wrote in message 
Please include ChangeLog entries and sanity.sh test cases with patches
you'd like us to accept, as per the ccvs/HACKING file.

Also, please send patches in universal (-u) or context (-c) diff format!

Index: ChangeLog
RCS file: /development/repository/ccvs/ChangeLog,v
retrieving revision
diff -c -r1.1.1.7 ChangeLog
*** ChangeLog   27 May 2003 10:00:06 -0000
--- ChangeLog   10 Jun 2003 12:23:55 -0000
*** 1,3 ****
--- 1,8 ----
+ 2003-06-10  Paul Edwards
+       * import.c: make imported files move out of Attic
+       * sanity.sh: added import2

This change still isn't appropriate. Imported files still _shouldn't_ be moved out of the Attic when any revision exists on the trunk. That should be reported as a conflict and resolved during a merge step. A merge should put the correct version on the trunk and move the file out of the Attic on commit.

That, or we need to resolve those other issues we've been discussing, mainly, what it really means when an import occurs with revisions on the trunk, when such issues should be resolved by assuming that the import should set the head revision, and how exactly that should happen.



Email: derek@ximbiot.com

Get CVS support at <http://ximbiot.com>!
Funny noises are not funny.
Funny noises are not funny.
Funny noises are not funny...

         - Bart Simpson on chalkboard, _The Simpsons_

reply via email to

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