← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to README

  • Committer: Aaron Bentley
  • Date: 2006-07-05 05:32:42 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060705053242-b9bbea9d1acd32d6
Make Ellerman's cdiff colours the default

Show diffs side-by-side

added added

removed removed

Lines of Context:
README
18
18
baz-import-branch will import an Arch or Baz Branch into a bzr standalone tree.
19
19
See baz-import for conversion details.
20
20
 
21
 
PUSH
 
21
CDIFF
 
22
cdiff mimics bzr diff, but displays the diff in colour. cdiff knows how
 
23
to read a ~/.colordiffrc file, in the same format as for colordiff(1).
 
24
 
 
25
# example ~/.colordiffrc
 
26
plain=darkwhite
 
27
newtext=darkblue
 
28
oldtext=darkred
 
29
diffstuff=darkgreen
 
30
 
 
31
RSPUSH
22
32
Uses rsync to copy a branch to a remote location.  Remembers the last location
23
33
used.  Will not push if
24
34
- there are unknown files
50
60
Delete unknown (or, optionally, ignored) files, leaving versioned files
51
61
untouched.
52
62
 
53
 
CONFLICTS
54
 
List files in the tree that have conflicts.
55
 
 
56
 
RESOLVE
57
 
Mark conflicts as resolved, by deleting TREE, BASE and OTHER files.
58
 
 
59
63
BRANCH-HISTORY
60
64
Show a history of the branch, separated by committer and branch nick.
61
65
 
68
72
 
69
73
PATCH
70
74
Use patch to apply a patch to this tree.
 
75
 
 
76
ZAP
 
77
Safely remove undesired checkouts