Previous Contents Doc Set Home


Index


Symbols

.NO_PARALLEL: special target,  228

.PARALLEL: special target,  228

.WAIT special target,  225

~/.codemgr_resrc,  57

~/.codemgrtoolrc,  58

A

access control, workspace,  71

access_control file,  62, 71

adjusting color,  211

Ancestor File,  183

Ancestor file,  191

ancestor file,  35
loading at startup,  187

archiving libraries,  226

args file,  62, 87

Auto Advance,  189

Auto Bringover option,  102

automatic merging,  190

automerging algorithm,  38

B

backup directory,  62, 106

branch delta,  49

branches,  49

branching, SCCS,  136

Bringover Create transaction,  64, 90 to 145
effect of checked out files,  92
file system accessibility,  93
Force Conflicts option,  92, 96
path name specification,  93
Preview option,  91, 96, 101
Quiet option,  92, 96, 102
search path,  94
Verbose option,  91, 96, 101
workspace locks,  93

Bringover Transaction,  89 to 99

Bringover Update transaction,  94 to 99
action summary table,  99
conflict detection during,  116
effect of checked-out files,  96
file system accessibility,  97
path names,  97
workspace locks,  98

Bringover/Putback transaction introduction,  27

Build button,  217

building with default values,  214

building with nondefault values,  214

C

checked-out files,  96, 102

children file,  62

chooser,  88

CLI, command-line interface
umbrella command,  52

CODEMGR_WS variable,  82

Codemgr_wsdata,  25, 62
access_control file,  62
args file,  62, 87
backup directory,  62, 106
children file,  62
history file,  63
locks file,  63
nametable file,  63
notification file,  63, 75
parent file,  63

CODEMGR_WSPATH variable,  82

color display, to adjust,  211

command-line interface
umbrella command,  52

command-line options,  184

Commands button
checking in a new file,  176
checking in files,  175
checking out files,  175
displaying the differences between deltas,  177
editing checked out files,  176
unchecking out a file,  177

comment
Putback transaction,  102

common ancestor delta,  117

concurrent file modification,  226

Configuring,  165
base window,  55
Chooser,  88
control area,  57
customization,  57
menus,  57
moving an existing project,  123
properties,  57
starting execution,  53
transaction model,  83
Workspace Graph pane,  55

conflict
detection during Bringover,  116
merging files in conflict,  133

copy-modify-merge
example,  18
model,  16

creating a workspace,  64

Current difference
defined,  36

current difference (Merging),  120

Current Working Directory,  183

D

def.dir.flp,  86

default build values,  214

default list
loading,  87
saving,  87

defaults files,  57
~/.codemgr_resrc,  57
~/.codemgrtoolrc,  58

Define New Target dialog box,  214

Delete,  64
Codemgr_wsdata Directory only,  65
Sources and Codemgr_wsdata Directory,  65

delta,  237, 239

delta ID,  239

dependency lists,  225
explicit ordering,  225
implicit ordering,  225

descendant,  35

Descendant file,  192

Difference
current,  36
defined,  36
next,  36
previous,  36
remaining,  37
resolved,  36
resolving,  189

difference (Merging)
current,  120
defined,  120
next,  120
previous,  120
resolved,  120

distributed make, explanation of,  219

Dmake, basic concept,  219

double-click action
Workspace Graph pane,  57

E

editing WorkShop targets,  215

environment variables,  81

example,  190

examples
Bringover/Putback/Resolve cycle,  143 to 147
merging SCCS history files,  134
reparenting,  68

F

file
collision,  228
concurrent modification,  226
loading,  182
loading from list,  187
loading three files at startup,  187
loading two files at startup,  186

file chooser,  88

File List pane
changing contents of,  87
constructing directory and file lists,  86
selecting files,  87

File List Program, see FLP

file lists
initial state,  86
transactions,  86

File menu,  57

files
merging,  133
relationships between files in parent and child workspaces,  27 to ??
specifying for transactions,  85

fixing build errors,  215

FLP,  86
default (def.dir.flp),  86

fonts, changing,  211

Force Conflicts option,  92, 96

FreezePointing
creating a freezepoint file,  201
extract a source directory,  202

FreezePointing terms,  199
extract,  200
freezepoint file,  199

G

glyphs, meaning of,  37, 193

graphical user interface (GUI), overview,  53

grouping files

H

HELPPATH environment variable,  210

hierarchy, workspace,  ?? to 48, 124 to 129

history file,  237

history file,  63, 78

I

icons
drag and drop,  56

L

Left File,  183

library update, concurrent,  226

limitations on makefiles,  225

list file,  187

Load
workspaces into Workspace Graph pane,  55

Load button,  183

loading
three files at startup,  187
two files at startup,  186

loading files,  182

locking workspaces,  80

locks
removing workspace locks,  81
viewing workspace locks (GUI),  81

locks file,  63

M

macro
dynamic,  226

makefiles, limitations,  225

manual pages, SunOS,  xviii

matriarch,  191

menu buttons
File,  57

menus
Configuring,  57

merging files
not in conflict,  132

Merging program,  119 to 121

merging SCCS history files,  32
example,  134
in conflict,  133

Merging window,  37

merging, starting,  192

metadata directory,  25

minus sign,  38

mkfile command,  210

moving to the next build error,  216

multiple targets,  227

N

name fields, workspace,  55

nametable file,  63

Next difference
defined,  36

next difference (Merging),  120

Next Error button,  216

nodes,  49

notification,  75

notification file,  63

O

Online Help,  53

Output File,  183

output file,  194

output, transaction,  85

P

parallelism
restricting,  228

Parent,  67

parent file,  63

parent/child introduction,  22 to 25

plus sign,  38

Preview option,  91, 96, 101

Previous difference
defined,  36

previous difference (Merging),  120

project
moving an existing project,  41, 123

Properties window,  57

Props button
changing double click action,  178
changing file list display,  177
changing history graph display,  179
changing history information display,  179
defining an editor,  178

Putback,  104

Putback transaction,  99 to 104
access control,  104
action summary table,  104
Auto Bringover option,  102
comment,  102
effect of checked-out files,  102
file system accessibility,  103
path names,  103
workspace locks,  103

Putback/Bringover transactions, introduction,  27

Q

Quiet option,  92, 96, 102

R

Remaining difference
defined,  37

Rename,  65

reparenting a workspace,  25, 66 to 70
example,  68

Resolve transaction,  118
introduction,  33
merging SCCS history files,  137
preparing files for conflict resolution,  117

Resolved difference
defined,  36

resolving differences,  189

restricting parallelism,  228

restrictions on makefiles,  225

Right File,  183

S

s.file,  237

Save As,  188

SCCS,  xiv, 48
branches,  49
delta,  237, 239
delta ID,  239
history file,  237
nodes,  49
version,  237, 239

SCCS history files,  19, 26, 85, 100, 131
branching,  136
common ancestor delta,  117
merging,  32, 131
resolving,  117

s-dot-file,  237

selecting files, transactions,  87

Set Default button,  57

SID,  239

Source Code Control System,  xiv, 48

specifying a build command,  214

specifying a build directory,  214

specifying a make target,  214

specifying a makefile,  214

spot help, see Online Help

starting a project
default FLP,  44, 124
SCCS file location,  123

starting Merging,  192
from Sun WorkShop,  182
from Sun WorkShop TeamWare,  182
from the command line,  184

Sun WorkShop,  182

Sun WorkShop TeamWare window,  182

swap space,  210

T

targets
.NO_PARALLEL:,  228
.PARALLEL:,  228
.WAIT,  225
multiple,  227

TeamWare
moving an existing project,  41

Tools menu,  204

transaction model,  83

Transaction Output window,  85

transactions
file lists,  86
file specification,  85

tutorial,  190

twconfig,  53

twmerge command,  184

U

Undo transaction,  105 to 108
implementation,  106
workspace locks,  106

unlocking workspaces,  80

V

variables, environment,  81
CODEMGR_WS,  82
CODEMGR_WSPATH,  82

Verbose option,  91, 96, 101

version,  237, 239

version number, displaying,  210

Versioning,  49

vertical bar,  37, 38

viewing the source of a build error,  216

W

window
Merging at startup,  37
showing three input files loaded,  38
showing two input files loaded,  37
Sun WorkShop TeamWare,  182

workspace
access control,  71, 94, 98
command history log,  78
create,  64
create using Bringover Create,  64
delete,  64
event notification,  75
hierarchies,  23
hierarchy configuration,  48, 124, 129
locking,  80
metadata directory (Codemgr_wsdata),  62
moving,  65
name fields,  55
removing locks,  81
renaming,  65
reparenting,  66 to 70
viewing locks from GUI,  81

Workspace Create,  64

Workspace Graph pane,  55
double-click action,  57
loading workspaces,  55

workspace introduction,  20 to 22

X

Xdefaults file,  211



Previous Contents Doc Set Home