Rev 1623: Use numbered backups when reverting in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Apr 10 06:15:39 BST 2006


------------------------------------------------------------
revno: 1623
revision-id: pqm at pqm.ubuntu.com-20060410051538-e33ae09cf879c95b
parent: pqm at pqm.ubuntu.com-20060409164922-071803e906c8b96d
parent: aaron.bentley at utoronto.ca-20060410042538-0d2090fda7db9e05
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-10 06:15:38 +0100
message:
  Use numbered backups when reverting
modified:
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060410042538-0d2090fda7db9e05
    parent: aaron.bentley at utoronto.ca-20060409191503-9669cce6fdf69546
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ttransform
    timestamp: Mon 2006-04-10 00:25:38 -0400
    message:
      Fixed backup numbering to match GNU standard better
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060409191503-9669cce6fdf69546
    parent: aaron.bentley at utoronto.ca-20060409163250-95b35cee9c2837ce
    parent: aaron.bentley at utoronto.ca-20060409170533-f5f4d5209111f095
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ttransform
    timestamp: Sun 2006-04-09 15:15:03 -0400
    message:
      Use numbered backup files
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060409170533-f5f4d5209111f095
    parent: aaron.bentley at utoronto.ca-20060409163211-e534392ec2c0b274
    parent: pqm at pqm.ubuntu.com-20060409164922-071803e906c8b96d
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Sun 2006-04-09 13:05:33 -0400
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060409163211-e534392ec2c0b274
    parent: aaron.bentley at utoronto.ca-20060407120040-1c73629500df0d87
    parent: abentley at panoramicfeedback.com-20060406152109-6320ad789f08fa68
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Sun 2006-04-09 12:32:11 -0400
    message:
      Merge with other bzr.ab
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060406152109-6320ad789f08fa68
    parent: aaron.bentley at utoronto.ca-20060404064141-9b186bd6f384b7bc
    parent: pqm at pqm.ubuntu.com-20060406115819-479ae52584747faa
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Thu 2006-04-06 11:21:09 -0400
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060407120040-1c73629500df0d87
    parent: aaron.bentley at utoronto.ca-20060404064141-9b186bd6f384b7bc
    parent: pqm at pqm.ubuntu.com-20060407062030-1277bbf3d808f04f
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Fri 2006-04-07 08:00:40 -0400
    message:
      Merge from bzr.dev



More information about the bazaar-commits mailing list