previous | next
 
home  |  sales  |  customers  |  jobs  |  contact  |  search  
 
 Home 
 Products 
 Customers 
 Comparisons 
 Sales 
 Test Drive 
      - Installation 
      - Setting Up the Demo Repo 
        . Cloning a Remote Repo 
        . Cloning a Local Copy 
      - Pull Changes from a Parent 
      - Making Changes 
        . Checking out files 
        . Modifying and creating files 
        . Viewing Changes 
        . Committing Changes 
      - Using Revtool 
        . Launching Revtool 
        . Looking at a Changeset 
        . Looking at a file 
      - Merging Changes 
        . Pulling and Resolving a Conflict 
        . Merging a file 
        . Committing a Merge 
      - Pushing Changes Back to the Parent 
      - Extra Credit Work 
        . Checkout Modes 
        . File and ChangeSet Comments 
 Company 
 Jobs 
 Support 
 Documentation 
 Search 
 Site Map 
    

Pushing Changes Back to the Parent
We committed a merge to our repo, and now we're finally ready to push our changes back upstream to our parent repo. But before we do that, let's make sure our parent doesn't have any changes we need to pull first. BitKeeper will not let you push your changes to a repo that has any changesets you don't already have, so we need to check for any changes before we push. Note that BitKeeper will stop you from doing the push if there are changesets you need to pull, so you don't absolutely have to check for them, but it's good practice here.

Right-click on the white background of your Explorer window.
Click BitKeeper -> View Remote Changesets...

A command window will pop up to list any remote changes in the parent that we don't already have in our repo. Of course, we already know that our parent doesn't have any changes, so we didn't need this step, but now we can see, for sure, that there are no changes in the parent:


BitKeeper shows us the changes command being executed and the parent repo we're checking against followed by the list of changesets on the remote side if there are any. We can see here that there are no changes in the parent that we need to pull. Close the command window, and let's check and see what changes we're about to push to our parent.

Right-click on the white background of your Explorer window.
Click BitKeeper -> View Local Changesets...

Another command window will open up listing the changesets we have that our parent does not have yet. It should look something like this, but it may not be exact depending on your version of BitKeeper:


Ok. We have several changesets that we've made that need to be pushed back to our parent. Let's take a look at them. The first two changes were pulled in when we pulled from . The third changeset is the one change we made locally where we modified recovery.c and added the new foo.c file. The final change is the merge we did. Notice that BitKeeper has marked this changeset as a MERGE changeset.

Those changes look good. We're ready to push them back to our parent.

Right-click on the white background of your Explorer window.
Click BitKeeper -> Push ChangeSets to Parent.

The familiar dialog pops up asking us where we want to push our changes, and our original clone parent is the default.

Click OK.


The command window pops up and starts doing its thing. We see from the output that BK has pushed our changed files back to our parent, and then it ran a consistency check on the remote repo to make sure everything is ok. Everything looks good.

Well, it looks like that's it for our Windows Test Drive!

Now that you have an idea of how BitKeeper works and how to interact with BitKeeper on Windows, you should poke around at some of the rest of the options in the Explorer plugin and see what all you can do. Open up the helptool and read through some of the docs if you want to learn more about some of the commands you do.

Right-click anywhere in Explorer.
Click BitKeeper -> Help...
Click More Help...

If you run into any problems, drop us a line at support@bitmover.com and let us know. We're happy to help!


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

© 1997-2011, BitMover, Inc.