previous | next
 
home  |  sales  |  customers  |  jobs  |  contact  |  search  
 
 Home 
 Products 
 Customers 
 Comparisons 
 Sales 
 Test drive 
 Company 
 Jobs 
 Support 
 Documentation 
      - Quick reference guide 
      - Reference manual 
      - Command Comparisons 
        . CVS to BK 
      - Bug Database 
        . Submitting Bugs 
        . Querying Bugs 
        . Viewing Bugs 
        . Updating Bugs 
      - User guide 
      - FAQS 
        . General usage 
        . Making changes 
        . Viewing changes 
        . File operations 
        . Multiple file operations 
        . Merges 
        . Import 
        . Undoing work 
        . Tags 
        . Failure recovery 
        . Event triggers 
        . Configuration 
        . Error messages 
        . Windows/NT 
        . BK/Web 
        . Linux 
      - HOWTO's 
        . License Keys: Closed Source 
        . License Keys: Open Source 
        . Multiple code lines 
        . CVS to BitKeeper 
 Search 
 Site Map 
    

Multiple code lines
Suppose that you have "dev" and "bugs" as your two lines of development. Further suppose that fixes added to "bugs" line should go into "dev" but not the other way around (this matches a large percentage of all software development efforts).

Create two copies of the same repository and name them "bugs" and "dev". We put them in /home/bk/bugs and /home/bk/dev.

When you need to do a bugfix, clone the bugs tree; when you want to do development, clone the dev tree.

A project lead will periodically pull changes from the main bugs tree into the dev tree to keep it up to date.

PROS:

  • simple to explain
  • all work tends to converge on the trunk
  • works for most people
  • follows the "work forward model"

CONS:

  • you have to be careful not to push the dev tree into bugs, use bk level to prevent this from happening.
  • can only easily work "forward", i.e., work may flow from bugs to dev but not backwards. It's possible to move stuff backwards as patches but it isn't as easy as the other way.

Home    Products    How to Buy    Customers    Downloads    Support    Privacy Policy    Bug DB    Site Map    Contact Us

© 1997-2007, BitMover, Inc.