Rev 2798: (lukas) cpatiencediff in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2798
revision-id: pqm at pqm.ubuntu.com-20070905053131-66z87azjvi32lcwu
parent: pqm at pqm.ubuntu.com-20070905051139-bogf0ne9pzsbsrs3
parent: mbp at sourcefrog.net-20070905044624-vaf6cxrjbvu6nh7t
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-09-05 06:31:31 +0100
message:
  (lukas) cpatiencediff
added:
  bzrlib/_patiencediff_c.c       _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
  bzrlib/patiencediff.py         patiencediff.py-20070721205536-jz8gaykeb7xtampk-1
renamed:
  bzrlib/patiencediff.py => bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  bzrlib/_patiencediff_py.py     cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
    ------------------------------------------------------------
    revno: 2781.1.2
    merged: mbp at sourcefrog.net-20070905044624-vaf6cxrjbvu6nh7t
    parent: mbp at sourcefrog.net-20070904091035-d11e7tfk55hy0a2z
    parent: pqm at pqm.ubuntu.com-20070905001648-0iigag4tq1u8mywn
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: cpatiencediff
    timestamp: Wed 2007-09-05 14:46:24 +1000
    message:
      merge trunk
    ------------------------------------------------------------
    revno: 2781.1.1
    merged: mbp at sourcefrog.net-20070904091035-d11e7tfk55hy0a2z
    parent: pqm at pqm.ubuntu.com-20070903062644-0rt7302gl1to109v
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: cpatiencediff
    timestamp: Tue 2007-09-04 19:10:35 +1000
    message:
      merge cpatiencediff from Lukas

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