BitKeeper Reference Card Repository-LevelCommands... File-LevelCommands Specifying file argument lists bk import [options] source dest BitMover, Inc. bk cmd -inv okes cmd on all files in this directory only Import external changes into a BK repository. 415-401-8808 bk cmd *.c -inv okes cmd on *.c -tpatch Import a patch (can be done repeatedly). http://www.bitkeeper.com bk -r cmd -inv okes cmd on all revision controlled files -tCVS Import a CVS (one time only). bk -rdir cmd -starts at dir instead of repository root bk parent [repository] bk -c -r cmd -inv okes cmd on all modified files BitKeeper Command Syntax Showorset the repository from which we pull or to bk -x -r cmd -inv okes cmd on all files not under revision bk [global_options] command [command_options][args] which we push control bk pull [options][source] See also bk sfiles. Global Options: Pulls changes from the parent or source to this repository -R Perform operation at root of repository -i Turn offautomerge bk ci [options][files] -r Perform recursive operations bk push [options][destination] Checks in locked and modified files Options common to most commands: Push changes from this repository to the parent or dest -ystr Sets the revision comment to str Prints differences before prompting for comments -v Run verbosely -a Automatically do a pull if the push has conflicts -p -q Run quietly bk resolve[options][project_root] bk clean [options][files] Merge conflicts created by a pull Unlock and remove unmodified working files Shows differences for all modified files -a Automerge if possible -p Repository-LevelCommands -t Te xt-only mode, use no GUI tools. bk co [options][files] bk abort -y[msg] Use msg as the check-in message Check out files Abort a failed pull or push bk setup [options] directory bk diffs [options][files] bk changes Create a newBitKeeper package in directory. Showdifferences in revision controlled files List changesets in this repository.See also bk revtool. -cfile Use file as the configuration file -rre v Diffworking file against revision re v -L List changes in local that are not in remote Use bk clone to create copies, bk setup is for the cre- -rr1..r2 Diffrevision r1 against revision r2 -R List changes in remote that are not in local ation of a newpackage. -r@cset Diffworking file against version in changeset bk -r check -acv [options] See also bk setuptool. cset Run a consistencycheck (likefsck). bk status [options][repository] -u Do unified diffs -f Fix anyfixable errors found during check. Shows repository information such as number of files, bk fix [file.c] bk clone [options] source destination uncommitted files, bk version, etc. Re-edit a checked in, but uncommitted, delta Makeacopyofarepository bk tag [options] symbol −c Re-edit the most recent changeset (use with cau- -rre v|tag clone backwards to the changeset specified by Tags the most recent changeset with a symbolic name tion). re v or tag. -rre v Tag re v instead of most recent changeset. bk edit [options][files] -l Makeahard linked clone (Unix only). See also bk clone -r. Checks out and locks files for editing. bk commit [options] bk unpull bk mv source destination Group checked in changes into a changeset Remove changesets added by the most recent bk pull. move file or directory,recording the move for all files -yC Set check-in comment to C Also removesthe merge if any. bk new [options][files] -YC Get check-in comment from file C bk version Add a newfile to the repository See also bk citool. Shows BitKeeper software version. bk prs [options][files] bk export [options][source] dest View revision history of a file or repository Extract a particular version as a tree or a patch -cdate Cut-offdates. -ipat Export only pathnames matching pattern pat. -dspec Specify output data specification -k Do not expand keywords. -h Suppress headers -rre v Export the tree as of revision re v. -rre v Specify a revision, or part of a range -tpatch Export the specified revision[s] as a traditional bk rm files patch. Remove a file in a recoverable way -xpat Export all pathnames not matching pattern pat. File-LevelCommands... Graphical Tools Merging bk sccslog [options][files] bk citool [dir or file list] Time ordered listing of deltas overall files bk help merging Graphical checkin tool, shows all modified files and all Get help on the merge process options directory bk sfiles [ ][ ] files not under revision control. Click on a modified file bk help merge-binaries Generates a list of files. and the differences are shown and a comment windowis Get help on merging binaries -c List locked and modified files available for checkin comments. -d List directories under revision control bk csettool [-rre vs] -n List files not in the correct location (names) View all changes contained in a changeset or set of Searching -p List files with pending deltas changesets. Lists the changesets, the deltas in each file in -x List files not under revision control each changeset, and shows the differences of each file. bk grep [options]pattern[files] bk undo [options][files] bk difftool left right Search some/all revisions of one or more files for a string. Remove one or more changesets Side-by-side file difference viewer.Ifright is a directory bk annotate [options][files] -are v Remove all changesets which occurred after re v the implied name is right/left,likediff(1). Showanannotated listing -f Do not prompt for confirmation bk fm3tool local gca remote file bk sccscat [options][files] -s Do not save undone changes as a patch 3-way side-by-side merge tool for resolving differences. Showanannotated listing of all versions of a file re vs Remove the list of changesets specified by re vs -r Walks through each change, allows you to select either, bk what files places the selection in a merge windowwhich can then be Shows SCCS keywords embedded within a file edited directly.Typically called from resolve. Getting morehelp bk fmtool local remote merge 2-way side-by-side merge tool for resolving differences. Other commands BitKeeper File Types This reference card is not a complete listing of the com- bk helptool [topic] mands and their options; it lists the most commonly used foo.c gfile, this is your source file Online help system with search facility. combinations. See the help facilities described belowfor SCCS/s.foo.c s.file - file with all revision history bk revtool [filename] p.file - lock file created when file is acomplete listing. SCCS/p.foo.c Graphically browse file or project history.Click left on a edited bk helptool [cmd] node and then click right on a later node to viewdiffer- z.file - lock file created when checking Graphical, hyperlinked, searchable help tool. Shows all SCCS/z.foo.c ences. Double click on a node to get an annotated listing in a newversion man pages, can search on words, page views stack like of that version of the file. Hit "c" to get an annotated list- SCCS/x.foo.c x.file - temporary file containing s.file web browsers. ing of all versions of a file (try this!). Click on anyline underway cmd in an annotated listing to jump to that node of the revision bk help Shows man page likehelp for cmd. history.Click "ViewChangeset" to see all other files changed at the same time as the selected line. http://www.bitkeeper.com/UG Common operations Online user guide. bk setuptool [package] Get a working copy of a tree Graphical tool to setup a newpackage. bk sendbug bk clone bk://linux.bkbits.net/linux-2.5 bk sendbug [-t] To report a bug or request a feature. Edit some files Graphical tool (or text based with -t) tool to report a bug. mail [email protected] cd linux-25 Forsupport from BitMover. bk vi Maintainers +1-415-401-8808 Check in the files, creating a changeset For right now support. bk citool Range and Date Syntax Push the changes back up Commands that takearevision option, -r,can take bk push either a range of deltas or a range of dates as the Pull updates argument. bk pull Specify both endpoints: Graphically browse a file’shistory -r1.1..1.5 bk revtool file Specify dates: Graphically browse a project’shistory -c98..98 bk revtool