bk-fixtool - (unknown subject)

---

NAME
bk fixtool − fix up pending changes

SYNOPSIS
bk fixtool [−fpsuw] [file ...]

DESCRIPTION
bk fixtool allows you to revise changes made to one or more working files prior to creating a delta. Typically, this feature is used immediately before a check in when it is realized that that there is unwanted work, such as debugging messages, mixed in with useful work which should be saved.

bk fixtool calls bk gfiles −c to find files which have been changed. The default is to find all files which have been changed but this may be controlled by specifying a set of files and/or directories.

For each changed file bk fixtool
☞ clears the screen
☞ shows the changes (via bk diff)
☞ and prompts for an action.

The action must be a letter followed by Enter. The choices are:
n (no) skips this file and continues to the next file.
q (quit) stop processing files.
u (unedit) discards all changes made to the named file.
y (yes) run bk fmtool on the previously checked in version of the file and the current working file. This is most commonly used to remove debugging statements while leaving the new work.

Note: When you have selected the changes you want, clicking Done saves your merges, overwriting the current working file.

OPTIONS
−f forces the answer to all prompts to be y.
−p passed through to bk diff to get procedural diffs.
−s passed through to bk diff to get side-by-side diffs.
−u passed through to bk diff to get unified diffs.
−w passed through to bk diff to ignore whitespace in diffs.

SEE ALSO
bk-citool, bk-diff, bk-fmtool

CATEGORY
File
Repository

---