Rev 5023: (Michal Junák) Bug #511987, support 'bzr export FILE' in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Feb 10 19:21:03 GMT 2010


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5023 [merge]
revision-id: pqm at pqm.ubuntu.com-20100210192057-uvi7tmdubcvh9xpo
parent: pqm at pqm.ubuntu.com-20100210182950-7fdfub9g9a2lplf3
parent: john at arbash-meinel.com-20100210175208-bubuwav4uqigu291
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-02-10 19:20:57 +0000
message:
  (Michal Junák) Bug #511987, support 'bzr export FILE'
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/apply_bundle.py  apply_changeset.py-20050620044656-dba4eb8021a36f95
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/chk_map.py              chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  bzrlib/export/__init__.py      __init__.py-20051114235828-1ba62cb4062304e6
  bzrlib/export/dir_exporter.py  dir_exporter.py-20051114235828-b51397f56bc7b117
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
  bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
  bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
  bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
  bzrlib/tests/features.py       features.py-20090820042958-jglgza3wrn03ha9e-1
  bzrlib/tests/per_branch/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
  bzrlib/tests/per_branch/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/per_branch/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
  bzrlib/tests/per_branch/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
  bzrlib/tests/per_branch/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
  bzrlib/tests/per_branch/test_create_clone.py test_create_clone.py-20090225031440-8ybpkzojo7cvourv-1
  bzrlib/tests/per_branch/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
  bzrlib/tests/per_branch/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
  bzrlib/tests/per_branch/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
  bzrlib/tests/per_branch/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
  bzrlib/tests/per_branch/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
  bzrlib/tests/per_branch/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
  bzrlib/tests/per_branch/test_tags.py test_tags.py-20070212110545-w2s799hm2jlbsmg5-1
  bzrlib/tests/per_branch/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
  bzrlib/tests/per_branch/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
  bzrlib/tests/per_interrepository/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
  bzrlib/tests/per_repository/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
  bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
  bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
  bzrlib/tests/per_tree/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
  bzrlib/tests/per_uifactory/__init__.py __init__.py-20090923045301-o12zypjwsidxn2hy-1
  bzrlib/tests/per_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/tests/per_workingtree/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
  bzrlib/tests/stub_sftp.py      stub_sftp.py-20051027032739-0e7ef4f7bab0e174
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_chk_map.py   test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
  bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
  bzrlib/tests/test_export.py    test_export.py-20090220201010-tpbxssdnezsvu9pk-1
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
  bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
  bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
  bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
  bzrlib/transport/log.py        log.py-20080902041816-vh8x5yt5nvdzvew3-5
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
  bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
  profile_imports.py             profile_imports.py-20060618020306-k5uw80achysrokj9-1
  tools/win32/bzr_postinstall.py bzr_postinstall.py-20060622100836-b3yup582rt3y0nvm-6
=== modified file 'Makefile'
--- a/Makefile	2010-01-29 10:29:17 +0000
+++ b/Makefile	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'NEWS'
--- a/NEWS	2010-02-10 18:29:50 +0000
+++ b/NEWS	2010-02-10 19:20:57 +0000
@@ -33,6 +33,9 @@
 Bug Fixes
 *********
 
+* Allow exporting a single file using ``bzr export``.
+  (Michal Junák, #511987)
+
 * Avoid infinite recursion when probing for apport.
   (Vincent Ladeuil, #516934)
 
@@ -11893,4 +11896,4 @@
 
 
 ..
-   vim: tw=74 ft=rst ff=unix
+   vim: tw=74 ft=rst ff=unix encoding=utf-8

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-02-10 15:46:03 +0000
+++ b/bzrlib/builtins.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/bundle/apply_bundle.py'
--- a/bzrlib/bundle/apply_bundle.py	2010-02-09 19:04:02 +0000
+++ b/bzrlib/bundle/apply_bundle.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2010 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2010-02-09 19:04:02 +0000
+++ b/bzrlib/bzrdir.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/chk_map.py'
--- a/bzrlib/chk_map.py	2010-01-29 15:18:58 +0000
+++ b/bzrlib/chk_map.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2010-02-09 19:45:18 +0000
+++ b/bzrlib/commands.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2010-02-02 23:02:18 +0000
+++ b/bzrlib/config.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2007, 2008, 2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #   Authors: Robert Collins <robert.collins at canonical.com>
 #            and others
 #

=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2010-02-05 10:27:33 +0000
+++ b/bzrlib/conflicts.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2007, 2009, 2010 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/doc_generate/autodoc_man.py'
--- a/bzrlib/doc_generate/autodoc_man.py	2010-01-29 10:36:23 +0000
+++ b/bzrlib/doc_generate/autodoc_man.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/export/__init__.py'
--- a/bzrlib/export/__init__.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/export/__init__.py	2010-01-29 12:04:38 +0000
@@ -138,14 +138,23 @@
     """Iter the entries for tree suitable for exporting.
 
     :param tree: A tree object.
-    :param subdir: None or the path of a directory to start exporting from.
+    :param subdir: None or the path of an entry to start exporting from.
     """
     inv = tree.inventory
     if subdir is None:
-        subdir_id = None
+        subdir_object = None
     else:
         subdir_id = inv.path2id(subdir)
-    entries = inv.iter_entries(subdir_id)
+        if subdir_id is not None:
+            subdir_object = inv[subdir_id]
+        # XXX: subdir is path not an id, so NoSuchId isn't proper error
+        else:
+            raise errors.NoSuchId(tree, subdir)
+    if subdir_object is not None and subdir_object.kind != 'directory':
+        yield subdir_object.name, subdir_object
+        return
+    else:
+        entries = inv.iter_entries(subdir_object)
     if subdir is None:
         entries.next() # skip root
     for entry in entries:

=== modified file 'bzrlib/export/dir_exporter.py'
--- a/bzrlib/export/dir_exporter.py	2010-02-01 22:22:28 +0000
+++ b/bzrlib/export/dir_exporter.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2009-2010 Canonical Ltd
+# Copyright (C) 2005, 2006, 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/fetch.py'
--- a/bzrlib/fetch.py	2010-02-09 19:04:02 +0000
+++ b/bzrlib/fetch.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/foreign.py'
--- a/bzrlib/foreign.py	2010-02-01 11:40:56 +0000
+++ b/bzrlib/foreign.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py	2010-01-29 10:36:23 +0000
+++ b/bzrlib/help_topics/__init__.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py	2010-01-15 05:33:28 +0000
+++ b/bzrlib/knit.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/lock.py'
--- a/bzrlib/lock.py	2010-02-05 12:13:07 +0000
+++ b/bzrlib/lock.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2010-02-03 08:17:04 +0000
+++ b/bzrlib/log.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/option.py'
--- a/bzrlib/option.py	2009-12-29 08:44:31 +0000
+++ b/bzrlib/option.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
--- a/bzrlib/plugins/launchpad/lp_registration.py	2010-01-29 10:36:23 +0000
+++ b/bzrlib/plugins/launchpad/lp_registration.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/progress.py'
--- a/bzrlib/progress.py	2010-01-15 04:17:57 +0000
+++ b/bzrlib/progress.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2010-02-01 11:39:02 +0000
+++ b/bzrlib/remote.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/revision.py'
--- a/bzrlib/revision.py	2010-01-15 03:39:59 +0000
+++ b/bzrlib/revision.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-02-10 03:06:24 +0000
+++ b/bzrlib/tests/__init__.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_add.py'
--- a/bzrlib/tests/blackbox/test_add.py	2010-02-08 08:17:50 +0000
+++ b/bzrlib/tests/blackbox/test_add.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_bound_branches.py'
--- a/bzrlib/tests/blackbox/test_bound_branches.py	2010-02-04 09:37:08 +0000
+++ b/bzrlib/tests/blackbox/test_bound_branches.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- a/bzrlib/tests/blackbox/test_commit.py	2010-02-10 15:46:03 +0000
+++ b/bzrlib/tests/blackbox/test_commit.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_conflicts.py'
--- a/bzrlib/tests/blackbox/test_conflicts.py	2010-02-02 17:29:50 +0000
+++ b/bzrlib/tests/blackbox/test_conflicts.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009, 2010 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_info.py'
--- a/bzrlib/tests/blackbox/test_info.py	2010-02-05 13:29:25 +0000
+++ b/bzrlib/tests/blackbox/test_info.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2010-02-03 08:17:04 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_selftest.py'
--- a/bzrlib/tests/blackbox/test_selftest.py	2010-02-03 14:08:55 +0000
+++ b/bzrlib/tests/blackbox/test_selftest.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2007 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_uncommit.py'
--- a/bzrlib/tests/blackbox/test_uncommit.py	2010-02-06 10:15:56 +0000
+++ b/bzrlib/tests/blackbox/test_uncommit.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2008, 2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_update.py'
--- a/bzrlib/tests/blackbox/test_update.py	2010-02-10 13:39:38 +0000
+++ b/bzrlib/tests/blackbox/test_update.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 # -*- coding: utf-8 -*-
 #
 # This program is free software; you can redistribute it and/or modify

=== modified file 'bzrlib/tests/features.py'
--- a/bzrlib/tests/features.py	2010-02-04 13:45:44 +0000
+++ b/bzrlib/tests/features.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_bound_sftp.py'
--- a/bzrlib/tests/per_branch/test_bound_sftp.py	2010-02-05 13:35:16 +0000
+++ b/bzrlib/tests/per_branch/test_bound_sftp.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Robey Pointer <robey at lag.net>, Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2009, 2010 Robey Pointer <robey at lag.net>, Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_branch.py'
--- a/bzrlib/tests/per_branch/test_branch.py	2010-02-05 13:56:14 +0000
+++ b/bzrlib/tests/per_branch/test_branch.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_break_lock.py'
--- a/bzrlib/tests/per_branch/test_break_lock.py	2010-02-08 08:41:38 +0000
+++ b/bzrlib/tests/per_branch/test_break_lock.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_commit.py'
--- a/bzrlib/tests/per_branch/test_commit.py	2010-02-08 08:42:18 +0000
+++ b/bzrlib/tests/per_branch/test_commit.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_create_checkout.py'
--- a/bzrlib/tests/per_branch/test_create_checkout.py	2010-02-08 08:43:01 +0000
+++ b/bzrlib/tests/per_branch/test_create_checkout.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_create_clone.py'
--- a/bzrlib/tests/per_branch/test_create_clone.py	2010-02-08 08:44:42 +0000
+++ b/bzrlib/tests/per_branch/test_create_clone.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_hooks.py'
--- a/bzrlib/tests/per_branch/test_hooks.py	2010-02-05 14:06:57 +0000
+++ b/bzrlib/tests/per_branch/test_hooks.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_http.py'
--- a/bzrlib/tests/per_branch/test_http.py	2010-02-08 08:46:32 +0000
+++ b/bzrlib/tests/per_branch/test_http.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_locking.py'
--- a/bzrlib/tests/per_branch/test_locking.py	2010-02-08 08:50:26 +0000
+++ b/bzrlib/tests/per_branch/test_locking.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_pull.py'
--- a/bzrlib/tests/per_branch/test_pull.py	2010-02-08 08:55:09 +0000
+++ b/bzrlib/tests/per_branch/test_pull.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_push.py'
--- a/bzrlib/tests/per_branch/test_push.py	2010-02-08 09:02:01 +0000
+++ b/bzrlib/tests/per_branch/test_push.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_revision_history.py'
--- a/bzrlib/tests/per_branch/test_revision_history.py	2010-02-08 09:02:33 +0000
+++ b/bzrlib/tests/per_branch/test_revision_history.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_tags.py'
--- a/bzrlib/tests/per_branch/test_tags.py	2010-02-08 09:05:43 +0000
+++ b/bzrlib/tests/per_branch/test_tags.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_uncommit.py'
--- a/bzrlib/tests/per_branch/test_uncommit.py	2010-02-08 09:08:31 +0000
+++ b/bzrlib/tests/per_branch/test_uncommit.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_branch/test_update.py'
--- a/bzrlib/tests/per_branch/test_update.py	2010-02-08 09:11:54 +0000
+++ b/bzrlib/tests/per_branch/test_update.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_interrepository/test_fetch.py'
--- a/bzrlib/tests/per_interrepository/test_fetch.py	2010-01-31 11:56:18 +0000
+++ b/bzrlib/tests/per_interrepository/test_fetch.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2008 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_repository/test_break_lock.py'
--- a/bzrlib/tests/per_repository/test_break_lock.py	2010-02-08 09:19:33 +0000
+++ b/bzrlib/tests/per_repository/test_break_lock.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_repository/test_commit_builder.py'
--- a/bzrlib/tests/per_repository/test_commit_builder.py	2010-02-08 09:20:42 +0000
+++ b/bzrlib/tests/per_repository/test_commit_builder.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_repository/test_fileid_involved.py'
--- a/bzrlib/tests/per_repository/test_fileid_involved.py	2010-02-08 09:23:42 +0000
+++ b/bzrlib/tests/per_repository/test_fileid_involved.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py	2010-02-10 18:29:50 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py	2010-02-10 19:20:57 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_repository/test_write_group.py'
--- a/bzrlib/tests/per_repository/test_write_group.py	2010-02-05 14:40:22 +0000
+++ b/bzrlib/tests/per_repository/test_write_group.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_tree/__init__.py'
--- a/bzrlib/tests/per_tree/__init__.py	2010-01-15 04:17:57 +0000
+++ b/bzrlib/tests/per_tree/__init__.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_uifactory/__init__.py'
--- a/bzrlib/tests/per_uifactory/__init__.py	2010-02-04 10:01:41 +0000
+++ b/bzrlib/tests/per_uifactory/__init__.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2010 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_versionedfile.py'
--- a/bzrlib/tests/per_versionedfile.py	2010-02-09 19:04:02 +0000
+++ b/bzrlib/tests/per_versionedfile.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2009 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # Authors:
 #   Johan Rydberg <jrydberg at gnu.org>

=== modified file 'bzrlib/tests/per_workingtree/test_smart_add.py'
--- a/bzrlib/tests/per_workingtree/test_smart_add.py	2010-02-08 10:49:48 +0000
+++ b/bzrlib/tests/per_workingtree/test_smart_add.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/stub_sftp.py'
--- a/bzrlib/tests/stub_sftp.py	2010-02-03 14:08:55 +0000
+++ b/bzrlib/tests/stub_sftp.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Robey Pointer <robey at lag.net>, Canonical Ltd
+# Copyright (C) 2005, 2006, 2008, 2009, 2010 Robey Pointer <robey at lag.net>, Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_branch.py'
--- a/bzrlib/tests/test_branch.py	2010-02-08 09:39:51 +0000
+++ b/bzrlib/tests/test_branch.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_bundle.py'
--- a/bzrlib/tests/test_bundle.py	2010-01-31 12:05:38 +0000
+++ b/bzrlib/tests/test_bundle.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_chk_map.py'
--- a/bzrlib/tests/test_chk_map.py	2010-01-29 15:18:58 +0000
+++ b/bzrlib/tests/test_chk_map.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2010-02-05 10:48:15 +0000
+++ b/bzrlib/tests/test_conflicts.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_export.py'
--- a/bzrlib/tests/test_export.py	2010-02-01 22:22:28 +0000
+++ b/bzrlib/tests/test_export.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2010 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -63,6 +63,16 @@
         self.build_tree(['target/', 'target/foo'])
         self.assertRaises(errors.BzrError, export.export, wt, 'target', format="dir")
 
+    def test_dir_export_existing_single_file(self):
+        self.build_tree(['dir1/', 'dir1/dir2/', 'dir1/first', 'dir1/dir2/second'])
+        wtree = self.make_branch_and_tree('dir1')
+        wtree.add(['dir2', 'first', 'dir2/second'])
+        wtree.commit('1')
+        export.export(wtree, 'target1', format='dir', subdir='first')
+        self.failUnlessExists('target1/first')
+        export.export(wtree, 'target2', format='dir', subdir='dir2/second')
+        self.failUnlessExists('target2/second')
+        
     def test_dir_export_files_same_timestamp(self):
         builder = self.make_branch_builder('source')
         builder.start_series()

=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2010-01-29 10:36:23 +0000
+++ b/bzrlib/tests/test_http.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_merge_core.py'
--- a/bzrlib/tests/test_merge_core.py	2010-02-09 19:04:02 +0000
+++ b/bzrlib/tests/test_merge_core.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2010-02-09 13:35:40 +0000
+++ b/bzrlib/tests/test_selftest.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- a/bzrlib/tests/test_sftp_transport.py	2010-02-09 13:35:40 +0000
+++ b/bzrlib/tests/test_sftp_transport.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Robey Pointer <robey at lag.net>
+# Copyright (C) 2005-2010 Robey Pointer <robey at lag.net>
 # Copyright (C) 2005, 2006, 2007 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify

=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py	2010-02-05 15:20:51 +0000
+++ b/bzrlib/tests/test_smart.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_smart_add.py'
--- a/bzrlib/tests/test_smart_add.py	2010-02-08 09:50:58 +0000
+++ b/bzrlib/tests/test_smart_add.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2010-02-05 15:26:17 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_transport.py'
--- a/bzrlib/tests/test_transport.py	2010-02-09 13:35:40 +0000
+++ b/bzrlib/tests/test_transport.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_ui.py'
--- a/bzrlib/tests/test_ui.py	2010-02-10 02:33:07 +0000
+++ b/bzrlib/tests/test_ui.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_upgrade.py'
--- a/bzrlib/tests/test_upgrade.py	2010-01-15 04:17:57 +0000
+++ b/bzrlib/tests/test_upgrade.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/test_workingtree_4.py'
--- a/bzrlib/tests/test_workingtree_4.py	2010-01-31 12:05:38 +0000
+++ b/bzrlib/tests/test_workingtree_4.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 # Authors:  Robert Collins <robert.collins at canonical.com>
 #
 # This program is free software; you can redistribute it and/or modify

=== modified file 'bzrlib/transport/log.py'
--- a/bzrlib/transport/log.py	2010-02-04 10:01:41 +0000
+++ b/bzrlib/transport/log.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/transport/sftp.py'
--- a/bzrlib/transport/sftp.py	2010-02-03 14:08:55 +0000
+++ b/bzrlib/transport/sftp.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/ui/text.py'
--- a/bzrlib/ui/text.py	2010-02-09 19:04:02 +0000
+++ b/bzrlib/ui/text.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/upgrade.py'
--- a/bzrlib/upgrade.py	2010-01-15 05:53:07 +0000
+++ b/bzrlib/upgrade.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005, 2006, 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/version.py'
--- a/bzrlib/version.py	2010-01-29 10:36:23 +0000
+++ b/bzrlib/version.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2009 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py	2010-02-04 10:01:41 +0000
+++ b/bzrlib/win32utils.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'profile_imports.py'
--- a/profile_imports.py	2009-11-14 11:50:10 +0000
+++ b/profile_imports.py	2010-02-10 17:52:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009 by Canonical Ltd
+# Copyright (C) 2006, 2008, 2009, 2010 by Canonical Ltd
 # Written by John Arbash Meinel <john at arbash-meinel.com>
 #
 # This program is free software; you can redistribute it and/or modify

=== modified file 'tools/win32/bzr_postinstall.py'
--- a/tools/win32/bzr_postinstall.py	2010-01-29 10:36:23 +0000
+++ b/tools/win32/bzr_postinstall.py	2010-02-04 16:06:36 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 by Canonical Ltd
+# Copyright (C) 2006, 2007, 2009, 2010 by Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by




More information about the bazaar-commits mailing list