Rev 1956: (robertc) Fix cmd_update can throw failure-to-unlock warnings if pending_merges fails. in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Aug 25 09:03:25 BST 2006
------------------------------------------------------------
revno: 1956
revision-id: pqm at pqm.ubuntu.com-20060825080325-00501d7303f03e89
parent: pqm at pqm.ubuntu.com-20060824002222-09d7139ba6ad0e6c
parent: robertc at robertcollins.net-20060825065050-026266d73d14e967
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-08-25 09:03:25 +0100
message:
(robertc) Fix cmd_update can throw failure-to-unlock warnings if pending_merges fails.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825065050-026266d73d14e967
parent: robertc at robertcollins.net-20060825010421-eb8cf29281d64ca3
parent: pqm at pqm.ubuntu.com-20060824002222-09d7139ba6ad0e6c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc fixen
timestamp: Fri 2006-08-25 16:50:50 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825010421-eb8cf29281d64ca3
parent: pqm at pqm.ubuntu.com-20060818230844-138315adab4cfe22
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc fixen
timestamp: Fri 2006-08-25 11:04:21 +1000
message:
fix race condition in cmd_update that could lead to failure-to-unlock warnings.
More information about the bazaar-commits
mailing list