Rev 4975: (spiv) Implement a per-file merge hook in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4975 [merge]
revision-id: pqm at pqm.ubuntu.com-20100120171944-8gkub20gotjcye67
parent: pqm at pqm.ubuntu.com-20100120164749-d4mdz4g4jpl866mt
parent: v.ladeuil+lp at free.fr-20100120163124-fhf3nh8e1nu7w3y7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-01-20 17:19:44 +0000
message:
  (spiv) Implement a per-file merge hook
added:
  bzrlib/plugins/news_merge/     news_merge-20100113072530-qj0i1em8th5pqhat-1
  bzrlib/plugins/news_merge/README readme-20100113072530-qj0i1em8th5pqhat-2
  bzrlib/plugins/news_merge/__init__.py __init__.py-20100113072530-qj0i1em8th5pqhat-3
  bzrlib/plugins/news_merge/news_merge.py news_merge.py-20100118070008-sb1qe88ha64es7nv-1
  bzrlib/plugins/news_merge/parser.py parser.py-20100113072530-qj0i1em8th5pqhat-4
  bzrlib/plugins/news_merge/tests/ tests-20100120143534-tooah3ps2hev1y3i-1
  bzrlib/plugins/news_merge/tests/__init__.py __init__.py-20100120143538-rka79n30130rvr4v-1
  bzrlib/plugins/news_merge/tests/test_news_merge.py test_news_merge.py-20100120143539-19kxox9ma117rejo-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
  bzrlib/hooks.py                hooks.py-20070325015548-ix4np2q0kd8452au-1
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/per_merger.py     per_merger.py-20091216002111-bzeo6wx2tcfpuj67-1

Diff too large for email (1088 lines, the limit is 1000).