Rev 1905: (dato, jam) Updated user messages in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Aug 1 14:17:07 BST 2006
------------------------------------------------------------
revno: 1905
revision-id: pqm at pqm.ubuntu.com-20060801131706-e6e4daaef24c3da3
parent: pqm at pqm.ubuntu.com-20060801073926-e0347d00e17d95fb
parent: john at arbash-meinel.com-20060731143156-1508e14154ce48d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-08-01 14:17:06 +0100
message:
(dato, jam) Updated user messages
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/ignores.py ignores.py-20060712153832-2von9l0t7p43ixsv-1
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731143156-1508e14154ce48d8
parent: john at arbash-meinel.com-20060731141629-1c1e121a63168968
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-07-31 09:31:56 -0500
message:
Add a test for handling a pending merge plus an update.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731141629-1c1e121a63168968
parent: john at arbash-meinel.com-20060731141008-e3092f038192c8a7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-07-31 09:16:29 -0500
message:
Assert that update informs the user about where their local commits went.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731141008-e3092f038192c8a7
parent: john at arbash-meinel.com-20060731140727-131a11a55b8d759b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-07-31 09:10:08 -0500
message:
re-enable a skipped update test, and clean it up
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731140727-131a11a55b8d759b
parent: john at arbash-meinel.com-20060731140426-e5604f4e255bde33
parent: dato at net.com.org.es-20060728111156-d25f0d0cf5f7a108
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-07-31 09:07:27 -0500
message:
[merge] Adeodato Simó, better reporting of what happens after 'bzr update'
------------------------------------------------------------
merged: dato at net.com.org.es-20060728111156-d25f0d0cf5f7a108
parent: dato at net.com.org.es-20060728111048-79626543aa70e3b0
parent: pqm at pqm.ubuntu.com-20060727200511-3bfb6377b1695fad
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.dev.improve-msgs
timestamp: Fri 2006-07-28 13:11:56 +0200
message:
[merge] bzr.dev 1887
------------------------------------------------------------
merged: dato at net.com.org.es-20060728111048-79626543aa70e3b0
parent: dato at net.com.org.es-20060721170007-bea76c69779e80e8
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.dev.improve-msgs
timestamp: Fri 2006-07-28 13:10:48 +0200
message:
Update with suggestions from John Arbash Meinel.
------------------------------------------------------------
merged: dato at net.com.org.es-20060721170007-bea76c69779e80e8
parent: pqm at pqm.ubuntu.com-20060721054643-20c103c916447e25
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.dev.improve-msgs
timestamp: Fri 2006-07-21 19:00:07 +0200
message:
cmd_commit.run:
- improve error message for BoundBranchOutOfDate.
cmd_update.run:
- print a note if local commits are now a pending merge.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731140426-e5604f4e255bde33
parent: john at arbash-meinel.com-20060731140322-7a9ac91b25cc2ebb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-07-31 09:04:26 -0500
message:
Updated doc
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731140322-7a9ac91b25cc2ebb
parent: john at arbash-meinel.com-20060730135437-1d722abdb14bff76
parent: dato at net.com.org.es-20060727234525-7da31b2994646a2a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-07-31 09:03:22 -0500
message:
[merge] Adeodato Simó: typo and grammar fixes
------------------------------------------------------------
merged: dato at net.com.org.es-20060727234525-7da31b2994646a2a
parent: pqm at pqm.ubuntu.com-20060727200511-3bfb6377b1695fad
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.dev
timestamp: Fri 2006-07-28 01:45:25 +0200
message:
Fix some typos and grammar issues.
More information about the bazaar-commits
mailing list