[Top][All Lists]

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

Re: import inconsistency

From: Pierre Asselin
Subject: Re: import inconsistency
Date: Fri, 13 Jun 2003 20:39:40 -0400
User-agent: tin/1.4.4-20000803 ("Vet for the Insane") (UNIX) (Linux/2.2.19-7.0.1 (i586))

Paul Edwards <kerravon@nosppaam.w3.to> wrote:

> All the messages I have seen in here appear to be coming from
> people who use the head.  I haven't seen any indication that
> people are adding files on a branch and then importing over
> them either.

Having a trunk is normal.  Your branches that never get merged are
very unusual.  Your imports into such trees are *exceedingly* unusual.
Yet, the update bug that you found --and it is a bug-- has nothing to
do with branches, dead files or Attics.  Remember what I posted earlier?

    import a test tree
    check out the trunk
    add a file "gatcha" on the trunk, commit, delete the sandbox
    add a file "gatcha" to the initial import tree, do a second import
    cvs checkout -j first_import -j second_import

The "gatcha" conflict is flagged by a single, ephemeral error message.

> Apparently all this time I was the only one who ever did a
> cvs diff between two tags too, and noticed the corresponding
> bug on deleted files.  Presumably the many active repositories
> don't use "cvs diff" much?  Or "cvs rdiff -s" either.  Or maybe
> there aren't that many truly active repositories like mine?

You probably had better odds than most of bumping into that one.

In truth, your problem is that you're trying to do multisite development,
and CVS assumes a central server.  Your company would do a lot better
if *you* ran the server.  The US guys woud just have to buy themselves
some bandwidth!

reply via email to

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