previous | next
 
home  |  search  |  contact  
  
 
 Introduction 
 BitKeeper Concepts  
 Getting Started  
      - Before You Begin... 
      - Setting Up a Repository 
        . General Setup 
        . Repository Configuration 
      - Populating a BitKeeper Repository 
        . Importing Files 
        . Including and Excluding Files 
        . Adding Individual Files 
      - Working with Repositories 
        . Cloning A Repository 
        . Making Changes 
        . Checking In Changes 
        . Sharing Changes 
        . Backing Out Changes 
 Advanced Operations 
 Advanced Topics 
 Reporting and Data Mining  
 Appendix A: Installation 
 Appendix B: Administration 
 Site Map 
     
Sharing Changes
With BitKeeper, because everyone has their own local copy of a repository, it's not immediately obvious to other team members when you have made a change. You must take action to share your changes. When you are ready to do so, you create a changeset by running bk citool or bk commit as described in the previous section Making Changes. After you've created the changeset, you will take the following steps to share your changes:
  • find out if anyone working in another repository has changed the same files you have
  • if necessary, merge your work
  • share your changes with another repository

The details of these steps are as follows:

Updating Your Work Area

After your work has been committed to a changeset as described in the last section, the next step is to pull the latest work from the rest of the team into your repository and resolve any differences. First use the bk pull command to pull work from the master tree. It's actually possible to pull from any tree you like, but if the environment is set up such that you have a staging area where people checkin their work, that's what you'll want to pull.

Merging Conflicts

Assuming there are no overlapping changes, the bk resolve command is automatically run by the pull command and will auto-merge the changes.

If there are conflicts that need to be resolved manually, BitKeeper will output a message about the conflict and save the pulled tree in the RESYNC directory. See Resolving Conflicts for more detailed information.

Sharing the Merged Work

After the the conflicts are resolved, or assuming there were no conflicts to resolve and you're ready to share your work, use the bk push command to share your ChangeSet with the team. This command applies your changes to the main repository and makes it available for others to pull with the bk pull command. Once again, you can push to any repository you like, but if you have a staging area with a master tree set up, that's most likely where you'll push.

Home    Company    Products    How to Buy    Downloads    Contact Us    Documentation    Support    Site Map

© 1997-2005, BitMover, Inc.