Breezy

Merge lp:~jelmer/brz/drop-new-in into lp:brz/3.1

  1. drop-new-in
  2. Merge into 3.1
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/drop-new-in
Merge into: lp:brz/3.1
Diff against target: 50 lines (+0/-8)
2 files modified
breezy/bzr/knitpack_repo.py (+0/-6)
breezy/tag.py (+0/-2)
To merge this branch: bzr merge lp:~jelmer/brz/drop-new-in
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+379370@code.launchpad.net

Commit message

Drop old 'New in' annotations for API documentation.

Description of the change

Drop old 'New in' annotations for API documentation.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/bzr/knitpack_repo.py'
2--- breezy/bzr/knitpack_repo.py 2020-02-09 13:40:47 +0000
3+++ breezy/bzr/knitpack_repo.py 2020-02-18 05:33:23 +0000
4@@ -270,8 +270,6 @@
5 class RepositoryFormatKnitPack5(RepositoryFormatPack):
6 """Repository that supports external references to allow stacking.
7
8- New in release 1.6.
9-
10 Supports external lookups, which results in non-truncated ghosts after
11 reconcile compared to pack-0.92 formats.
12 """
13@@ -309,8 +307,6 @@
14 class RepositoryFormatKnitPack5RichRoot(RepositoryFormatPack):
15 """A repository with rich roots and stacking.
16
17- New in release 1.6.1.
18-
19 Supports stacking on other repositories, allowing data to be accessed
20 without being stored locally.
21 """
22@@ -350,8 +346,6 @@
23 class RepositoryFormatKnitPack5RichRootBroken(RepositoryFormatPack):
24 """A repository with rich roots and external references.
25
26- New in release 1.6.
27-
28 Supports external lookups, which results in non-truncated ghosts after
29 reconcile compared to pack-0.92 formats.
30
31
32=== modified file 'breezy/tag.py'
33--- breezy/tag.py 2020-01-11 17:50:28 +0000
34+++ breezy/tag.py 2020-02-18 05:33:23 +0000
35@@ -97,7 +97,6 @@
36 :param overwrite: Whether to overwrite existing, divergent, tags.
37 :param ignore_master: Do not modify the tags in the target's master
38 branch (if any). Default is false (so the master will be updated).
39- New in bzr 2.3.
40 :return: Tuple with tag updates as dictionary and tag conflicts
41 """
42 raise NotImplementedError(self.merge_to)
43@@ -277,7 +276,6 @@
44 :param overwrite: Overwrite conflicting tags in the target branch
45 :param ignore_master: Do not modify the tags in the target's master
46 branch (if any). Default is false (so the master will be updated).
47- New in bzr 2.3.
48
49 :returns: Tuple with tag_updates and tag_conflicts.
50 tag_updates is a dictionary with new tags, None is used for

Subscribers

People subscribed via source and target branches