Merge to trunk left added file in attic

[Ed Dunkle]

After merging with the main trunk, a file I added is still in the
attic.  Perhaps I merged incorrectly.
How do I get it on the main trunk now?

address@hidden storm]$ cvs status -v
src/net/verizon/storm/data/OrderCheckAdapter.java
===================================================================
File: no file OrderCheckAdapter.java            Status: Needs Checkout

  Working revision:    No entry for OrderCheckAdapter.java
  Repository revision: 1.2    
/export/home/cvsroot/storm/src/net/verizon/storm/data/Attic/OrderCheckAdapter.java,v

  Existing Tags:
       CR_6837                         (branch: 1.1.2)

address@hidden storm]$ cvs update
src/net/verizon/storm/data/OrderCheckAdapter.java
U src/net/verizon/storm/data/OrderCheckAdapter.java
address@hidden storm]$ cvs status -v
src/net/verizon/storm/data/OrderCheckAdapter.java
===================================================================
File: OrderCheckAdapter.java    Status: Up-to-date

  Working revision:    1.2
  Repository revision: 1.2    
/export/home/cvsroot/storm/src/net/verizon/storm/data/Attic/OrderCheckAdapter.java,v
  Sticky Tag:          (none)
  Sticky Date:         (none)
  Sticky Options:      (none)

  Existing Tags:
       CR_6837                         (branch: 1.1.2)

address@hidden storm]$ cvs ci src/net/verizon/storm/data
cvs commit: Examining src/net/verizon/storm/data
address@hidden storm]$


Here is the check in after the merge:

Checking in data/OrderCheckAdapter.java;
/export/home/cvsroot/storm/src/net/verizon/storm/data/Attic/OrderCheckAdapter.java,v

<--  OrderCheckAdapter.java
new revision: 1.2; previous revision: 1.1
done
Checking in data/OrdersSchema.java;
/export/home/cvsroot/storm/src/net/verizon/storm/data/OrdersSchema.java,v
<--  OrdersSchema.java
new revision: 1.22; previous revision: 1.21
done





__________________________________________________________________
Your favorite stores, helpful shopping tools and great gift ideas. Experience 
the convenience of buying online with address@hidden 
http://shopnow.netscape.com/

Get your own FREE, personal Netscape Mail account today at 
http://webmail.netscape.com/