Rev 1863: (jam) update uncommit (bugs: #32526, #31426) in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1863
revision-id: pqm at pqm.ubuntu.com-20060713133754-64c134fffd39fd99
parent: pqm at pqm.ubuntu.com-20060713133105-7c8e508aaa4886e2
parent: john at arbash-meinel.com-20060713122432-f66fd0000dabb58e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-07-13 14:37:54 +0100
message:
  (jam) update uncommit (bugs: #32526, #31426)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
  bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060713122432-f66fd0000dabb58e
    parent: john at arbash-meinel.com-20060711210940-248917f611b6a2e5
    parent: pqm at pqm.ubuntu.com-20060712215300-126aea223e34b65c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: uncommit-31426
    timestamp: Thu 2006-07-13 07:24:32 -0500
    message:
      [merge] bzr.dev 1861
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060711210940-248917f611b6a2e5
    parent: john at arbash-meinel.com-20060711205328-405ab56e2638bd37
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: uncommit-31426
    timestamp: Tue 2006-07-11 16:09:40 -0500
    message:
      Fix bug 31426, have uncommit keep track of pending merges.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060711205328-405ab56e2638bd37
    parent: john at arbash-meinel.com-20060711204704-228c6748c0d56183
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: uncommit-31426
    timestamp: Tue 2006-07-11 15:53:28 -0500
    message:
      Add copyright to test_uncommit.py
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060711204704-228c6748c0d56183
    parent: john at arbash-meinel.com-20060711204532-42dfc1f487d2a2b0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: uncommit-32526
    timestamp: Tue 2006-07-11 15:47:04 -0500
    message:
      NEWS fix bug #32526
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060711204532-42dfc1f487d2a2b0
    parent: john at arbash-meinel.com-20060711202757-ea7d1917f7282aad
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: uncommit-32526
    timestamp: Tue 2006-07-11 15:45:32 -0500
    message:
      Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060711202757-ea7d1917f7282aad
    parent: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: uncommit-32526
    timestamp: Tue 2006-07-11 15:27:57 -0500
    message:
      cleanup the uncommit tests