3
3
This is is a set of plugins for bzr.
6
baz-bzr will import an Arch or Baz branch into bzr.
6
baz-import will import an Arch or Baz Archive into a bzr repository.
14
- data on revisions merged
16
- symlinks in Arch trees are not handled (but can be skipped).
18
14
After more commits are made to the baz/arch branch, you can re-run baz-import
19
15
to import just those changes.
21
The conversion algorithm is still in flux, and old data may become invalid as
22
newer conversion functionality is introduced.
18
baz-import-branch will import an Arch or Baz Branch into a bzr standalone tree.
19
See baz-import for conversion details.
26
22
Uses rsync to copy a branch to a remote location. Remembers the last location
29
25
- there are uncommitted changes in the working tree.
30
26
These safeguards are intended to prevent dirty trees from being uploaded.
33
Output a version of the requested file that indicates which revision introduced
37
Temporarily put aside some changes, to restore them later. This can be useful
38
to separate two sets of changes, so that they can be committed separately.
29
Shelve allows you to temporarily put changes you've made "on the shelf",
30
ie. out of the way, until a later time when you can bring them back from
31
the shelf with the 'unshelve' command.
33
You can put multiple items on the shelf, each time you run unshelve the
34
most recently shelved changes will be reinstated.
36
If filenames are specified, only the changes to those files will be
37
shelved, other files will be left untouched.
39
If a revision is specified, changes since that revision will be shelved.
41
If you specifiy "--pick" you'll be prompted for each hunk of the diff as
42
to whether you want to shelve it or not. Press "?" at the prompt for help.
47
http://bazaar.canonical.com/BzrShelveExample
41
50
Delete unknown (or, optionally, ignored) files, leaving versioned files
45
List files in the tree that have conflicts.
48
Mark conflicts as resolved, by deleting TREE, BASE and OTHER files.
51
54
Show a history of the branch, separated by committer and branch nick.