lp:bzr

Created by bzr PQM on 2009-09-03 and last modified on 2017-03-17
Get this branch:
bzr branch lp:bzr
Only bzr PQM can upload to this branch. If you are bzr PQM please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
bzr PQM
Project:
Bazaar
Review team:
bzr-core
Status:
Development

Recent revisions

6622. By Florent Gallaire on 2017-03-17

Fix for Windows and 32-bit platforms buggy gmtime(). [r=vila,richard-wilbur]

6621. By Vincent Ladeuil on 2017-01-30

Merge 2.7 into trunk including fix for bug #1657238 [r=vila]

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

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

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

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.