~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes from revision 6123.11.2

Rev	Summary	Authors	Date
6123.11.2	Suggest --include-sidelines instead of --include-merges. Suggest --include-sidelines instead of --include-merges.	Martin von Gagern	13 years ago
6123.11.1	Rename --include-merges option to --include-sidelines. Rename --include-merges option to --include-sidelines. The rationale behind this rename is the following: a MERGE is a single commit with two parents. But instead of the merge itself being ommitted from the log, it is the line(s) of development starting with the secondary parent(s). We already call the primary undotted-revno left-parent-only line of development MAINLINE, so calling the other lines SIDELINES should be an intuitive concept. The UI change is backwards compatible, as the old option name is preserved. If both options are specified, in either their positive or their negative form, then the sideline one takes precedence. Conflicting options are not reported. That means that a --include-sidelines argument in an alias might take precedence over an --no-include-merges argument on the command line. As aliases and command line tend to be written by the same person, this should be a rare scenario. The tests have not been updated yet, in order to show that the modification does not break any existing tests. Updated tests will be in a separate commit. The Python API hasn't been changed, as it's more difficult to hide backwards-compatibility options there, and as two options to the same effect might confuse programmers.	Martin von Gagern	13 years ago
6123.1.14	(jr) add class GettextIndentedHelpFormatter to add gettext t... (jr) add class GettextIndentedHelpFormatter to add gettext translations to option help (Jonathan Riddell)	Canonical.com Patch ...	13 years ago
6123.1.13	(vila) Provide NameMatcher for config stores using arbitrary... (vila) Provide NameMatcher for config stores using arbitrary names for the sections. (Vincent Ladeuil)	Canonical.com Patch ...	13 years ago
6123.1.12	(jr) Turn on translations for help topics. (Jonathan Riddell... (jr) Turn on translations for help topics. (Jonathan Riddell)	Canonical.com Patch ...	13 years ago
6123.1.11	(jr) ensure all tests using gpg keys run self.import_keys() ... (jr) ensure all tests using gpg keys run self.import_keys() first (Jonathan Riddell)	Canonical.com Patch ...	13 years ago
6123.1.10	(jr) Turn on translations for errors. (Jonathan Riddell) (jr) Turn on translations for errors. (Jonathan Riddell)	Canonical.com Patch ...	13 years ago
6123.1.9	(jelmer) In "bzr tag", (jelmer) In "bzr tag", mention when an existing tag has been updated (with --force). (Jelmer Vernooij)	Canonical.com Patch ...	13 years ago
6123.1.8	(vila) Tweaks about older stable releases and SRUs announcem... (vila) Tweaks about older stable releases and SRUs announcements. (Vincent Ladeuil)	Canonical.com Patch ...	13 years ago
6123.1.7	(vila) Simplify option expansion. (Vincent Ladeuil) (vila) Simplify option expansion. (Vincent Ladeuil)	Canonical.com Patch ...	13 years ago
6123.1.6	(jam) Merge 2.4 into trunk, including bugs #825027 and #8372... (jam) Merge 2.4 into trunk, including bugs #825027 and #837293	Canonical.com Patch ...	13 years ago
6123.1.5	(jelmer) Allow tag implementations to not support ghost revi... (jelmer) Allow tag implementations to not support ghost revisions. (Jelmer Vernooij)	Canonical.com Patch ...	13 years ago
6123.1.4	(gz) Fix breakage when creating a transport at drive root on... (gz) Fix breakage when creating a transport at drive root on windows (Martin [gz])	Canonical.com Patch ...	13 years ago
6123.1.3	(vila) Cleanup http imports (Jelmer Vernooij) (vila) Cleanup http imports (Jelmer Vernooij)	Canonical.com Patch ...	13 years ago
6123.1.2	(jelmer) Mention the number of tags that was pushed/pull, (jelmer) Mention the number of tags that was pushed/pull, if any. (Jelmer Vernooij)	Canonical.com Patch ...	13 years ago
6123.1.1	(jelmer) Add a ``bugtracker`` configuration option. (Jelmer ... (jelmer) Add a ``bugtracker`` configuration option. (Jelmer Vernooij)	Canonical.com Patch ...	13 years ago
6123	(vila) Start supporting option expansion in config stacks. (... (vila) Start supporting option expansion in config stacks. (Vincent Ladeuil)	Canonical.com Patch ...	13 years ago
6122	(jelmer) Various fixes to allow tests to run against foreign... (jelmer) Various fixes to allow tests to run against foreign branches. (Jelmer Vernooij)	Canonical.com Patch ...	13 years ago
6121	(jelmer) bzr tag no longer errors if a tag exists but has th... (jelmer) bzr tag no longer errors if a tag exists but has the same target. (Jelmer Vernooij)	Canonical.com Patch ...	13 years ago
6120	(vila) Output time stamps while running ``make check`` to ge... (vila) Output time stamps while running ``make check`` to get better timings from pqm (Vincent Ladeuil)	Canonical.com Patch ...	13 years ago

Older »