summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-08-11 18:10:13 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-08-11 18:10:13 +0200
commit11bf622600cd1a1eaeda3af64f4757fffa558ae7 (patch)
tree99c82621a8c90726853193e85db3c4926df46570
parenteed0579130c3c11e64675c20d21284abf294b77d (diff)
merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to
Jonathan Riddell
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--debian/changelog7
-rwxr-xr-xtest/pre-upload-check.py2
3 files changed, 9 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 0cc6c04fc..2c84176fc 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2430,7 +2430,7 @@ bool DoSource(CommandLine &CmdL)
Src.c_str(), vcs.c_str(), uri.c_str());
if(vcs == "Bzr")
ioprintf(c1out,_("Please use:\n"
- "bzr get %s\n"
+ "bzr branch %s\n"
"to retrieve the latest (possibly unreleased) "
"updates to the package.\n"),
uri.c_str());
diff --git a/debian/changelog b/debian/changelog
index d05fa280b..a0fb6e0fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.16~exp5ubuntu6) UNRELEASED; urgency=low
+
+ * merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to
+ Jonathan Riddell
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 11 Aug 2011 18:09:45 +0200
+
apt (0.8.16~exp5ubuntu5) oneiric; urgency=low
* debian/control:
diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py
index f9da8f941..e79c8e800 100755
--- a/test/pre-upload-check.py
+++ b/test/pre-upload-check.py
@@ -115,7 +115,7 @@ class testAuthentication(unittest.TestCase):
"""
test if the authentication is working, the repository
of the test-data can be found here:
- bzr get http://people.ubuntu.com/~mvo/bzr/apt/apt-auth-test-suit/
+ bzr branch http://people.ubuntu.com/~mvo/bzr/apt/apt-auth-test-suit/
"""
# some class wide data