Rev 1650: (mbp) #36963, #3619, #39657,
other cleanups in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Apr 20 03:51:30 BST 2006
------------------------------------------------------------
revno: 1650
revision-id: pqm at pqm.ubuntu.com-20060420025129-8e219a634d2d4dbc
parent: pqm at pqm.ubuntu.com-20060420022821-4337b8fa4942d8fe
parent: mbp at sourcefrog.net-20060420024217-e7530e10e384d5dd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 03:51:29 +0100
message:
(mbp) #36963, #3619, #39657, other cleanups
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420024217-e7530e10e384d5dd
parent: mbp at sourcefrog.net-20060420023721-04d8a3b015987240
parent: pqm at pqm.ubuntu.com-20060420022821-4337b8fa4942d8fe
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:42:17 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420023721-04d8a3b015987240
parent: mbp at sourcefrog.net-20060420023332-6da5e1c018e334b7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:37:21 +1000
message:
Add .hg to default ignore list
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420023332-6da5e1c018e334b7
parent: mbp at sourcefrog.net-20060420022422-aaa19eff8795bfd6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:33:32 +1000
message:
(PathsDoNotExist) review style comments
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420022422-aaa19eff8795bfd6
parent: mbp at sourcefrog.net-20060420012904-b3166df65e728801
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:24:22 +1000
message:
Fix up blackbox test for error on status of nonexistent files
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420012904-b3166df65e728801
parent: mbp at sourcefrog.net-20060419072552-b7ec734f02ecd596
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 11:29:04 +1000
message:
Translate unknown sftp errors to PathError, no NoSuchFile
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419072552-b7ec734f02ecd596
parent: mbp at sourcefrog.net-20060419072040-98ded2cd48084027
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 17:25:52 +1000
message:
Better help for init-repo (Erik)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419072040-98ded2cd48084027
parent: mbp at sourcefrog.net-20060419071605-51207e739c997442
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 17:20:40 +1000
message:
Less alarming warning in bzr help output - just 'remember to keep backups'
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419071605-51207e739c997442
parent: mbp at sourcefrog.net-20060419062053-d09353cfdede1116
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 17:16:05 +1000
message:
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419062053-d09353cfdede1116
parent: mbp at sourcefrog.net-20060419061931-8bf1bc8344c02a09
parent: mbp at sourcefrog.net-20060419051159-856e022c4b11fcd4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 16:20:53 +1000
message:
[merge] (Malone #36963) verbose commit output
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419051159-856e022c4b11fcd4
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.36963
timestamp: Wed 2006-04-19 15:11:59 +1000
message:
verbose commit now specifically identifies modified/renamed/reparented files
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419061931-8bf1bc8344c02a09
parent: mbp at sourcefrog.net-20060419034716-2beab68d4c46415c
parent: mbp at sourcefrog.net-20060419052851-87d41b5b92793719
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 16:19:31 +1000
message:
[merge] reflow tutorial.txt (Malone #39657)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419052851-87d41b5b92793719
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.39657
timestamp: Wed 2006-04-19 15:28:51 +1000
message:
Reflow tutorial.txt to fit on 80-col screen (Malone #39657)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419034716-2beab68d4c46415c
parent: mbp at sourcefrog.net-20060418064941-d6a8c9a334e9e7e1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 13:47:16 +1000
message:
Fix formatting of NoWorkingTree and NotLocalUrl exceptions
More information about the bazaar-commits
mailing list