lp:~vila/bzr/integration

Branch merges

Propose for merging

Merged into lp:bzr at revision 6621

Vincent Ladeuil: Approve on 2017-01-30

Diff: 31 lines (+4/-4)

2 files modified

bzrlib/lazy_regex.py (+3/-3)
doc/en/release-notes/bzr-2.7.txt (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #62539: Re: 'module' object has no attribute 'TIOCGWINSZ'	Low	Fix Released
Bug #65286: bzr push should not work by default if there are uncommited changes	Medium	Fix Released
Bug #82693: want to run tests in a particular plugin without installing it	Wishlist	Fix Released
Bug #113809: update performs two merges	High	Fix Released
Bug #140563: unicode command line options cause unicodeencodeerror traceback	Medium	Fix Released
Bug #145612: Unable to use pure-python plugins from /usr/share/ ... (FHS) location	Undecided	Fix Released
Bug #206577: bzr send should warn on uncommitted local changes	Low	Fix Released
Bug #252834: serve --quiet is not quiet	Low	Fix Released
Bug #284038: push should warn about uncommitted changes	Medium	Fix Released
Bug #306264: tests failure in bzr-1.10: Failure when receiving data from the peer	Low	Fix Released
Bug #316192: bzrlib.plugin.load_plugins() loads system plugins even for non-system bzrlib	Medium	Fix Released
Bug #316357: SIGWINCH support for progress bar	Wishlist	Fix Released
Bug #346593: deprecation warning in bzrlib/filters/__init__.py	Low	Fix Released
Bug #353370: Lines cut off at 80 chars regardless of actual terminal size	High	Fix Released
Bug #354985: check-newsbugs.py LaunchpadLoginError; should be ported to launchpadlib	Low	Fix Released
Bug #366107: Bazaar should attempt Basic authentication if HTTP server offers NTLM	Undecided	Fix Released
Bug #367726: ssh usernames specified in .ssh/config are not honoured for bzr+ssh connections	Critical	Fix Released
Bug #376582: Authentication prompt goes to standard out	Undecided	Fix Released
Bug #383920: python-2.6 regression: tests hang on test_transport_implementations.TransportTests.test_get(HTTPSServer_PyCurl)	Medium	Fix Released
Bug #389648: AttributeError _callable_names in get_hook_name running bzr hooks	Medium	Fix Released
Bug #392401: Packaging Bug: test SSL certificates missing from 1.16 PPA	Medium	Fix Released
Bug #394190: selftest failures on OSX with UTF-8 locale	High	Fix Released
Bug #397716: timezone-dependent annotation test failures	High	Fix Released
Bug #400554: bzr rm {--force, --keep, --safe} is hard to use	Medium	Fix Released
Bug #405745: blackbox.test_check.ChrootedCheckTests.test_check_missing_branch hangs on AIX	Medium	Fix Released
Bug #411413: want configuration items to disable/enable plugins	Medium	Fix Released
Bug #412930: BZR_PLUGIN_PATH should give full control on plugin directories	Medium	Fix Released
Bug #413514: TestLocale.test_log_BOGUS fails on karmic python2.6	High	Fix Released
Bug #414743: paramiko should be default client for Windows	High	Fix Released
Bug #419950: test failure when selftest is aliased	Low	Fix Released
Bug #426344: pending merges are not viewed as tree changes	High	Fix Released
Bug #430510: transport registry updated while in use: RuntimeError: dictionary changed size during iteration	High	Fix Released
Bug #430749: "Failed to load compiled extensions" warning breaks the test suite	High	Fix Released
Bug #430868: weave file names collide with committer ids	Medium	Fix Released
Bug #433120: test suite regression on OSX and FreeBSD	Medium	Fix Released
Bug #438158: dpush should behave identically to push	High	Fix Released
Bug #440631: mutable_tree.has_changes() should not take a parameter but always check against basis	Medium	Fix Released
Bug #442980: duplicate test IDs when using an ftp test server	Low	Fix Released
Bug #443041: test failure on babune: bzrlib.tests.per_transport.TransportTests.test_append_bytes(FTPTestServer	Medium	Fix Released
Bug #472161: Can't upload non-ascii URLs	Medium	Fix Released
Bug #474807: MYSQL/BZR P3: Incomprehensible results of "bzr log -rX..Y"	High	Fix Released
Bug #491711: hook to permit per file merges	High	Fix Released
Bug #492561: Selftest fails to start on Windows	Critical	Fix Released
Bug #513967: MultiClamp device fails to reconnect when commander is closed	Low	Invalid
Bug #516183: sftp transport module requires testtools	Critical	Fix Released
Bug #519319: --strict should default to warning the user	Low	Fix Released
Bug #519862: bzr log -r ..X fails with get_parent_map(None); bzr log -r revno:1..X is fine	High	Fix Released
Bug #526221: tests involving stub_sftp are broken on win32	Medium	Fix Released
Bug #526353: selftest: thread.error: can't start new threadsts.test_put_file_non_atomic(RemoteTCPTransport,SmartTCPServer_for_testing)	Undecided	Fix Released
Bug #528436: PID check failed. RNG must be re-initialized after fork(). Hint: Try Random.atfork()	Undecided	Fix Released
Bug #529968: bzr resolve --take-this fails to rename file.THIS to file on ContentConflict	High	Fix Released
Bug #552922: BZR_PLUGINS_AT can be fooled by os.listdir order	Critical	Fix Released
Bug #562665: --no-strict warning printed as tuple	Critical	Fix Released
Bug #1184021: Missing __iter__ on ResponseFile during import-dsc	Medium	Fix Released

Link a bug report

Related blueprints

6621. By Vincent Ladeuil on 2017-01-30

Merge 2.7 into trunk including fix for bug #1657238

6620. By Vincent Ladeuil on 2017-01-17

Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

6619. By Patch Queue Manager <email address hidden> on 2016-04-21

(richard-wilbur) Use initial_comment as commit_message for lp_propose.(Shawn
 Wang) (Shawn Wang)

6618. By Patch Queue Manager <email address hidden> on 2016-04-21

(richard-wilbur) Update COPYING.txt from the original
 http://www.gnu.org/licenses/gpl-2.0.txt (Only differences were in
 whitespace.) Thanks to Petr Stodulka for pointing out the discrepancy.
 (Richard Wilbur)

6617. By Patch Queue Manager <email address hidden> on 2016-04-21

(richard-wilbur) Ensure build of English use guide always uses English text
 even when user's locale specifies a different language. (Jelmer Vernooij)

6616. By Patch Queue Manager <email address hidden> on 2016-02-01

(vila) Open trunk again as 2.8b1 (Vincent Ladeuil)

6615. By Patch Queue Manager <email address hidden> on 2016-02-01

(vila) Release 2.7.0 (Vincent Ladeuil)

6614. By Patch Queue Manager <email address hidden> on 2016-01-31

(vila) Use ssl.match_hostname instead of our own. (Vincent Ladeuil)

6613. By Patch Queue Manager <email address hidden> on 2016-01-22

(vila) Make all transport put_bytes() raises TypeError when given unicode
 strings rather than bytes (Vincent Ladeuil)

6612. By Patch Queue Manager <email address hidden> on 2016-01-21

(vila) Forbid more operations on ReadonlyTransportDecorator (Vincent Ladeuil)