[Top][All Lists]

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

Re: Merge (-j) is removing new files

From: Wayne Johnson
Subject: Re: Merge (-j) is removing new files
Date: Fri, 20 Dec 2002 08:17:41 -0800 (PST)

Quite right.  Now how did that get there...

I'll have to check out our procedures to see how it got tagged.  It
shouldn't have.

Thanks, I'll sleep easier tonight.

--- Larry Jones <address@hidden> wrote:
> Wayne Johnson writes:
> > 
> > I recently attempted to merge changes from this branch onto the trunk
> and
> > found that the cvs up -j from_here -j to_here command was attempting
> to
> > remove several files from the trunk.  
> > 
> > The problem is that the files had been newly added to the trunk and
> had
> > never been on the maintanance branch.
> > 
> > Anyone have a clue as to why this happened.  
> If you look at the problem files with "cvs status -v", you'll probably
> find that they have the "from_here" tag but not the "to_here" tag. 
> -Larry Jones
> I've got PLENTY of common sense!  I just choose to ignore it. -- Calvin

Wayne Johnson,             | There are two kinds of people: Those 
3943 Penn Ave. N.          | who say to God, "Thy will be done," 
Minneapolis, MN 55412-1908 | and those to whom God says, "All right, 
(612) 522-7003             | then,  have it your way." --C.S. Lewis

Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.

reply via email to

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