[Top][All Lists]

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

Re: import inconsistency

From: Paul Edwards
Subject: Re: import inconsistency
Date: Tue, 10 Jun 2003 23:28:24 GMT

"Derek Robert Price" <derek@ximbiot.com> wrote in message 
> 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.

Ok.  I wasn't sure about that.  That's why I asked.  I just assumed
that if other imports go direct to a non-Attic, why shouldn't this
import do the same.

> 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.

Ok, well that's a more comprehensive change than I was trying
to do at this stage.

BFN.  Paul.

reply via email to

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