Checking In Files

There are several ways to check in new and modified files. We suggest using the graphical checkin tool because it tends to generate better comments. There are also command line commands that you can use as well.

To run citool, do

bk citool

To use the command line to check in a new file use:

bk new file

or

bk delta -i file

To use the command line to check in modified files use:

bk delta file

or

bk ci file

At some point, either when a logical unit of work is done, or when a team member is ready to share work with the team, the work in the repository should be committed to a changeset. A changeset is a grouping of changes and the smallest thing that can be propagated between repositories. Changesets have their own comments and their own revision numbers, separate and independent of the revision numbers and comments of the file changes it is grouping together. For example:

ChangeSet@1.1036, 2001-02-06 11:25:53-05:00, doogie@work.bitmover.com Added rmgone command. Minor bug fix to lclone. man/man1/bk-rmgone.1 1.1 01/02/06 11:24:31 doogie@work.bitmover.com.com +41 -0 Added rmgone man page. src/bk.sh 1.256 01/02/06 10:52:09 doogie@work.bitmover.com +2 -0 Added a catch for bad options to lclone. src/bk.sh 1.255 01/02/06 10:49:54 doogie@work.bitmover.com +40 -0 Added rmgone command. src/port/unix_platform.sh 1.15 01/02/06 10:46:56 doogie@work.bitmover.com +4 -0 Support for using nawk on Solaris.

The above changeset (revision 1.1036) shows the description of changes to four files plus the comments.

The best way to commit changes to a changeset is to use the bk citool GUI command (for those who want a command line interface, read below about the bk commit command). bk citool combines the actions of checking in files and creating the ChangeSet file. Citool will guide you through entering comments for each of the new or changed files, including the ChangeSet file, displaying the changes you've made so it's very easy to remember what work was done and write appropriate comments. For more information on citool, please see the help page by running bk helptool citool.