[Pkg-bazaar-commits] ./bzr-rebase/unstable r42: merge 0.4.

Jelmer Vernooij jelmer at samba.org
Sat Aug 2 13:20:54 UTC 2008


------------------------------------------------------------
revno: 42
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Sat 2008-08-02 15:20:54 +0200
message:
  merge 0.4.
added:
  Makefile
  bzr-rebase.cfg
modified:
  .bzrignore
  COPYING
  NEWS
  __init__.py
  debian/changelog
  maptree.py
  rebase.py
  setup.py
  test_blackbox.py
  test_maptree.py
  test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.47
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2007-12-09 05:19:20 +0100
    message:
      Start on 0.4.
    modified:
      NEWS
      setup.py
    ------------------------------------------------------------
    revno: 24.1.48
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2007-12-14 15:15:16 +0100
    message:
      Fix test.
    modified:
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.49
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2007-12-21 19:20:06 +0100
    message:
      Fix tests.
    modified:
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.50
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2007-12-21 20:21:54 +0100
    message:
      Add pydoctor file, more docstrings.
    added:
      bzr-rebase.cfg
    modified:
      .bzrignore
      __init__.py
      rebase.py
    ------------------------------------------------------------
    revno: 24.1.51
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2008-01-03 20:14:18 +0100
    message:
      Fix missing newline character.
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 24.1.52
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sat 2008-01-12 00:29:36 +0100
    message:
      Set author property to preserve committer and original author of the commit.
    modified:
      NEWS
      rebase.py
      test_rebase.py
        ------------------------------------------------------------
        revno: 24.3.3
        committer: Lukáš Lalinský <lalinsky at gmail.com>
        branch nick: rebase
        timestamp: Fri 2008-01-11 23:28:12 +0100
        message:
          Copy author or committer name from the old revision to the author property in the new revision
        modified:
          rebase.py
          test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.53
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2008-02-01 01:28:14 +0100
    message:
      Fix test.
    modified:
      test_blackbox.py
    ------------------------------------------------------------
    revno: 24.1.54
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2008-03-30 21:03:33 +0200
    message:
      add makefile.
    added:
      Makefile
    ------------------------------------------------------------
    revno: 24.1.55
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2008-03-30 21:16:11 +0200
    message:
      Fix tests when using the latest version of bzr.
    modified:
      Makefile
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.56
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2008-05-11 16:23:46 +0200
    message:
      Avoid using deprecated revision_parents() function.
    modified:
      rebase.py
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.57
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2008-05-11 20:52:36 +0200
    message:
      Change license to GPLv3+
    modified:
      NEWS
      __init__.py
      maptree.py
      rebase.py
      setup.py
      test_blackbox.py
      test_maptree.py
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.58
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2008-05-11 20:57:07 +0200
    message:
      Ignore plugins directory used by 'make check'.
    modified:
      .bzrignore
    ------------------------------------------------------------
    revno: 24.1.59
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: pending-merge
    timestamp: Sun 2008-05-18 15:50:53 +0200
    message:
      Use standard exception for uncommitted changes.
    modified:
      rebase.py
    ------------------------------------------------------------
    revno: 24.1.60
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: pending-merge
    timestamp: Sun 2008-05-18 15:57:53 +0200
    message:
      Support rebasing pending merges.
    modified:
      NEWS
      __init__.py
      rebase.py
      test_blackbox.py
    ------------------------------------------------------------
    revno: 24.1.61
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2008-05-18 16:47:01 +0200
    message:
      use cheaper as_revision_id.
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 24.1.62
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2008-05-29 14:14:41 +0200
    message:
      Fix some uses of get_revision_graph().
    modified:
      __init__.py
      rebase.py
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.63
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2008-05-29 14:14:54 +0200
    message:
      Use selftest --starting-with.
    modified:
      Makefile
    ------------------------------------------------------------
    revno: 24.1.64
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2008-05-29 16:07:18 +0200
    message:
      Avoid use of get_revision_graph() calls.
    modified:
      NEWS
      __init__.py
      rebase.py
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.65
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2008-05-29 16:23:15 +0200
    message:
      Use tuples for parents.
    modified:
      rebase.py
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.66
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2008-05-29 16:34:24 +0200
    message:
      Deal with parents being a tuple.
    modified:
      rebase.py
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.67
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2008-05-29 16:57:15 +0200
    message:
      Fix blackbox tests, add comments to assertions.
    modified:
      rebase.py
      test_blackbox.py
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.68
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2008-06-11 19:35:50 +0200
    message:
      Handle case where base branch is descendant of current branch.
    modified:
      __init__.py
      test_blackbox.py
    ------------------------------------------------------------
    revno: 24.1.69
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2008-06-11 20:29:08 +0200
    message:
      Clarify test.
    modified:
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.70
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sat 2008-06-21 18:52:25 +0200
    message:
      Update copy of GPL.
    modified:
      COPYING
    ------------------------------------------------------------
    revno: 24.1.71
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Mon 2008-06-23 04:04:00 +0200
    message:
      Use tuples more consistently.
    modified:
      rebase.py
      test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.72
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Mon 2008-06-23 04:04:28 +0200
    message:
      Update NEWS.
    modified:
      NEWS
    ------------------------------------------------------------
    revno: 24.1.73
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Tue 2008-07-01 04:22:32 +0200
    message:
      Merge small import fix from Alexander.
    modified:
      __init__.py
        ------------------------------------------------------------
        revno: 24.4.1
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: rebase
        timestamp: Fri 2008-06-20 21:56:34 +0300
        message:
          Don't import Option from bzrlib/commands.py
        modified:
          __init__.py
    ------------------------------------------------------------
    revno: 24.1.74
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Tue 2008-07-22 22:57:38 +0200
    message:
      Merge compatibility fixes with bzr 1.6.
    modified:
      __init__.py
      rebase.py
      test_blackbox.py
      test_maptree.py
      test_rebase.py
        ------------------------------------------------------------
        revno: 24.5.1
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dev
        timestamp: Thu 2008-06-26 18:15:23 +1000
        message:
          Code cleanup - 80 column wrap, no trailing spaces.
        modified:
          __init__.py
        ------------------------------------------------------------
        revno: 24.5.2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dev
        timestamp: Fri 2008-07-18 21:43:56 +1000
        message:
          Merge trunk.
        modified:
          __init__.py
        ------------------------------------------------------------
        revno: 24.5.3
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dev
        timestamp: Sat 2008-07-19 03:18:13 +1000
        message:
          Update rebase to 1.6b3 API changes.
        modified:
          rebase.py
          test_blackbox.py
          test_maptree.py
          test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.75
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Tue 2008-07-22 23:00:18 +0200
    message:
      Merge speed improvements from lifeless.
    modified:
      NEWS
      __init__.py
      rebase.py
      test_blackbox.py
      test_rebase.py
        ------------------------------------------------------------
        revno: 24.5.4
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dev
        timestamp: Sat 2008-07-19 18:08:45 +1000
        message:
           * Fixed O(history) access during plan creation (Robert  Collins, lp:#249823).
        modified:
          NEWS
          __init__.py
          rebase.py
          test_blackbox.py
          test_rebase.py
    ------------------------------------------------------------
    revno: 24.1.76
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sat 2008-08-02 15:14:50 +0200
    message:
      Depend on bzr 1.6.
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 24.1.77
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sat 2008-08-02 15:15:09 +0200
    message:
      Fix spelling, release 0.4.
    modified:
      NEWS
-------------- next part --------------
Diff too large for email (2406 lines, the limit is 1000).


More information about the Pkg-bazaar-commits mailing list