Rev 1718: (mbp,jamesh) show file times;
doc in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Jun 6 12:04:46 BST 2006
------------------------------------------------------------
revno: 1718
revision-id: pqm at pqm.ubuntu.com-20060606110445-79d71fb5b8e9fa8e
parent: pqm at pqm.ubuntu.com-20060606102520-64c05752f159a669
parent: mbp at sourcefrog.net-20060606103838-6a402aba15478322
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-06-06 12:04:45 +0100
message:
(mbp,jamesh) show file times; doc
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060606103838-6a402aba15478322
parent: mbp at sourcefrog.net-20060604153943-999dfdbb6b85719d
parent: james.henstridge at canonical.com-20060606052939-6d66ea66329554da
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-06-06 11:38:38 +0100
message:
[merge] Show file mod times in diff; use this for add/delete (jamesh)
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060606052939-6d66ea66329554da
parent: james.henstridge at canonical.com-20060601081248-4699a58ed1efe60f
parent: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Tue 2006-06-06 13:29:39 +0800
message:
merge from bzr.dev and fix conflicts
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060601081248-4699a58ed1efe60f
parent: james.henstridge at canonical.com-20060601075724-40b5698d12b775f2
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Thu 2006-06-01 16:12:48 +0800
message:
support passing a path in to get_file_mtime
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060601075724-40b5698d12b775f2
parent: james.henstridge at canonical.com-20060525040852-51f8dfa66baa4e61
parent: pqm at pqm.ubuntu.com-20060531063654-ad54f9b8f90f2dda
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Thu 2006-06-01 15:57:24 +0800
message:
merge from bzr.dev, fix conflicts
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060525040852-51f8dfa66baa4e61
parent: james.henstridge at canonical.com-20060523140822-b545377b143d8220
parent: pqm at pqm.ubuntu.com-20060525000013-db043ecdc78b88f4
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Thu 2006-05-25 12:08:52 +0800
message:
merge from bzr.dev, fixing conflicts
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060523140822-b545377b143d8220
parent: james.henstridge at canonical.com-20060517041531-364f9e2e0f56c0d4
parent: pqm at pqm.ubuntu.com-20060523110622-5ad5c2bf9dee4fc5
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Tue 2006-05-23 22:08:22 +0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060517041531-364f9e2e0f56c0d4
parent: james.henstridge at canonical.com-20060515033027-ea8dc6b9ca6b1773
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Wed 2006-05-17 12:15:31 +0800
message:
Add some more tests that make sure the diff output contains the appropriate
dates.
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060515033027-ea8dc6b9ca6b1773
parent: james.henstridge at canonical.com-20060515015255-daba5f27621b2105
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Mon 2006-05-15 11:30:27 +0800
message:
Fix RevisionTree.get_file_mtime() to return the date of the revision that
last modified the file in question, using method suggested by Robert.
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060515015255-daba5f27621b2105
parent: james.henstridge at canonical.com-20060513070036-6e4ff775c8955252
parent: pqm at pqm.ubuntu.com-20060512234849-259ff209fff58489
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Mon 2006-05-15 09:52:55 +0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060513070036-6e4ff775c8955252
parent: james.henstridge at canonical.com-20060512144253-432dacad7d891d7f
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Sat 2006-05-13 15:00:36 +0800
message:
fix up existing tests
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060512144253-432dacad7d891d7f
parent: james.henstridge at canonical.com-20060512143717-8b5596b2e5dd04c4
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Fri 2006-05-12 22:42:53 +0800
message:
Simplify logic a little
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060512143717-8b5596b2e5dd04c4
parent: pqm at pqm.ubuntu.com-20060511175037-f66b84c6a9fc4c12
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.diff-output
timestamp: Fri 2006-05-12 22:37:17 +0800
message:
add dates to diff output and get rid of /dev/null
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060604153943-999dfdbb6b85719d
parent: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Sun 2006-06-04 16:39:43 +0100
message:
Notes on naming of factories
More information about the bazaar-commits
mailing list