Rev 1887: (Matthieu Moy) handle 'bzr diff' when not in a branch. in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Jul 27 21:05:12 BST 2006
------------------------------------------------------------
revno: 1887
revision-id: pqm at pqm.ubuntu.com-20060727200511-3bfb6377b1695fad
parent: pqm at pqm.ubuntu.com-20060727152539-1ff3153c7434f986
parent: john at arbash-meinel.com-20060727181822-56f20d32c9710761
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-07-27 21:05:11 +0100
message:
(Matthieu Moy) handle 'bzr diff' when not in a branch.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
------------------------------------------------------------
merged: john at arbash-meinel.com-20060727181822-56f20d32c9710761
parent: john at arbash-meinel.com-20060727181448-62962f823be5d3cc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-07-27 13:18:22 -0500
message:
clean up comment.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060727181448-62962f823be5d3cc
parent: john at arbash-meinel.com-20060727181146-d055d50bbb68ae30
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-07-27 13:14:48 -0500
message:
minor typo fix
------------------------------------------------------------
merged: john at arbash-meinel.com-20060727181146-d055d50bbb68ae30
parent: john at arbash-meinel.com-20060727180257-63b805723d6e780d
parent: Matthieu.Moy at imag.fr-20060727051114-ebb0b2018d517195
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-07-27 13:11:46 -0500
message:
Matthieu Moy: fix 'bzr diff' outside a working tree.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060727051114-ebb0b2018d517195
parent: Matthieu.Moy at imag.fr-20060727045847-7c358df0190ff193
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.moy
timestamp: Thu 2006-07-27 07:11:14 +0200
message:
needs_tree -> needs_branch
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060727045847-7c358df0190ff193
parent: Matthieu.Moy at imag.fr-20060727045320-5dd96d812a6afe86
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.moy
timestamp: Thu 2006-07-27 06:58:47 +0200
message:
One missing blank line.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060727045320-5dd96d812a6afe86
parent: Matthieu.Moy at imag.fr-20060725061058-d9a10e5c73fdd69d
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.moy
timestamp: Thu 2006-07-27 06:53:20 +0200
message:
Formatting and style for the last patch.
Also one typo: ett -> err in test_diff.py.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060725061058-d9a10e5c73fdd69d
parent: pqm at pqm.ubuntu.com-20060724034248-d4d33393b6327d71
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.moy
timestamp: Tue 2006-07-25 08:10:58 +0200
message:
Fixed and tested "bzr diff" outside a working tree.
Some bugs were introduced by my patch for revno:N:path revisionspec.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060727180257-63b805723d6e780d
parent: john at arbash-meinel.com-20060727143010-9db27d72d6a5caa7
parent: pqm at pqm.ubuntu.com-20060727152539-1ff3153c7434f986
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-07-27 13:02:57 -0500
message:
[merge] bzr.dev 1886
More information about the bazaar-commits
mailing list