Browsing Bosnian translation

2069.

The solution is to merge the revisions from the mainline into your local
branch. To do so, use ``bzr merge`` to get the new revisions from the
mainline. This merge may result in conflicts if the other developer's changes
overlap with your changes. These conflicts should be resolved before
continuing. After any conflicts have been resolved, or even if there were no
conflicts, Bazaar requires that you explicitly commit these new revisions
to your local branch. This requirement gives you an opportunity to test the
resulting working tree for correctness, since the merged revisions could have
made arbitrary changes. After testing, you should commit the merge using
``bzr commit``. This clears up the diverged branches situation. Your local
branch can now be pushed to the mainline.

2071.

=================== ===========================================================
BZRPATH Path where bzr is to look for shell plugin external
commands.
BZR_EMAIL E-Mail address of the user. Overrides EMAIL.
EMAIL E-Mail address of the user.
BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.
EDITOR Editor for editing commit messages.
BZR_PLUGIN_PATH Paths where bzr should look for plugins.
BZR_DISABLE_PLUGINS Plugins that bzr should not load.
BZR_PLUGINS_AT Plugins to load from a directory not in BZR_PLUGIN_PATH.
BZR_HOME Directory holding .bazaar config dir. Overrides HOME.
BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA and
HOME.
BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// URLs).
BZR_SSH Path to SSH client, or one of paramiko, openssh, sshcorp,
plink or lsh.
BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).
BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).
BZR_COLUMNS Override implicit terminal width.
BZR_CONCURRENCY Number of processes that can be run concurrently (selftest)
BZR_PROGRESS_BAR Override the progress display. Values are 'none' or 'text'.
BZR_PDB Control whether to launch a debugger on error.
BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a
breakin debugger.
BZR_TEXTUI_INPUT Force console input mode for prompts to line-based (instead
of char-based).
=================== ===========================================================

2096.

added List files added in working tree.
ancestry List all revisions merged into this branch.
assert-fail Test reporting of assertion failures
bundle-info Output interesting stats about a bundle
bundle-revisions Create a merge-directive for submitting changes.
cat-revision Write out metadata for a revision.
dump-btree Dump the contents of a btree index file to stdout.
export-pot Export command helps and error messages in po format.
file-id Print file_id of a particular file or directory.
file-path Print path of file_ids to a file or directory.
find-merge-base Find and print a base revision for merging two branches.
hooks Show hooks.
inventory Show inventory of the current working copy or a revision.
local-time-offset Show the offset in seconds from GMT to local time.
lookup-revision Lookup the revision-id from a revision-number
merge-directive Generate a merge directive for auto-merge tools.
modified List files modified in working tree.
re-sign Create a digital signature for an existing revision.
reference list, view and set branch locations for nested trees.
relpath Show path of a file relative to root
repair-workingtree Reset the working tree state file.
revision-history Display the list of revision ids on a branch.
revision-info Show revision number and revision id for a given revision
identifier.
rocks Statement of optimism.
selftest Run internal test suite.
shell-complete Show appropriate completions for context.
test-script Run a shell-like test from a file.
touching-revisions Return revision-ids which affected a particular file.
unknowns List unknown files.
wait-until-signalled Test helper for
test_start_and_stop_bzr_subprocess_send_signal.

2138.

Called when a stacked branch is activating its fallback locations.
transform_fallback_location is called with (branch, url), and should
return a new url. Returning the same url allows it to be used as-is,
returning a different one can be used to cause the branch to stack on
a closer copy of that fallback_location. Note that the branch cannot
have history accessing methods called on it during this hook because
the fallback locations have not been activated. When there are
multiple hooks installed for transform_fallback_location, all are
called with the url returned from the previous hook.The order is
however undefined.

2213.

Called before a commit is performed on a tree. The start commit hook
is able to change the tree before the commit takes place. start_commit
is called with the bzrlib.mutabletree.MutableTree that the commit is
being performed on.

2217.

Called when the smart client is submitting a request to the smart
server. Called with a bzrlib.smart.client.CallHookParams object.
Streaming request bodies, and responses, are not accessible.

2220.

Called by the bzr server when an exception occurs. server_exception is
called with the sys.exc_info() tuple return true for the hook if the
exception has been handled, in which case the server will exit
normally.

2231.

Called with argument StatusHookParams after Bazaar has displayed the
status. StatusHookParams has the attributes (old_tree, new_tree,
to_file, versioned, show_ids, short, verbose). The last four arguments
correspond to the command line options specified by the user for the
status command. to_file is the output stream for writing.

2233.

Called with argument StatusHookParams before Bazaar displays the
status. StatusHookParams has the attributes (old_tree, new_tree,
to_file, versioned, show_ids, short, verbose). The last four arguments
correspond to the command line options specified by the user for the
status command. to_file is the output stream for writing.

2248.

Feature long short line
---------------------- ------------- ------------ -------------------
design goal detailed view concise view 1 revision per line
committer name+email name only name only
author name+email - -
date-time format full date only date only
commit message full full top line
tags yes yes yes
merges indicator - yes -
status/delta optional optional -
diff/patch optional optional -
revision-id optional optional -
branch nick yes - -
foreign vcs properties yes yes -
preferred levels all 1 1
digital signature optional - -