Rev 417: Merge trunk. in file:///data/jelmer/bzr-gtk/signatures/

Jelmer Vernooij jelmer at samba.org
Sun Mar 30 16:51:16 BST 2008


At file:///data/jelmer/bzr-gtk/signatures/

------------------------------------------------------------
revno: 417
revision-id: jelmer at samba.org-20080330155115-qmf874szoqvyq9cl
parent: jelmer at samba.org-20080330154708-5mh3p01mqmo51lwn
parent: jelmer at samba.org-20080329024443-wuwnt6bs687z8zmf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: signatures
timestamp: Sun 2008-03-30 17:51:15 +0200
message:
  Merge trunk.
removed:
  tortoise-bzr.py                tortoisebzr.py-20070309165449-24x2kud0ux6l6p7f-1
added:
  icons/commit.svg               commit.svg-20080320094353-cnzwesr8cyk57zbp-1
  icons/commit16.svg             commit16.svg-20080320094353-cnzwesr8cyk57zbp-2
  icons/diff16.svg               diff16.svg-20080320094353-cnzwesr8cyk57zbp-3
modified:
  NEWS                           news-20070325173539-3va57o99cz3o57xe-1
  __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
  branchview/linegraph.py        graph.py-20051016214152-ebf565808c860cf7
  icons/commit.png               commit.png-20060807164904-vgevuckgd4ah8m1q-4
  icons/commit16.png             commit16.png-20060808190051-fh6tnwcjzxozt4nc-1
  icons/diff.png                 diff.png-20060807164904-vgevuckgd4ah8m1q-5
  icons/diff16.png               diff16.png-20060808190051-fh6tnwcjzxozt4nc-2
  icons/log.png                  log.png-20060808190051-fh6tnwcjzxozt4nc-3
  icons/log16.png                log16.png-20060808190051-fh6tnwcjzxozt4nc-4
  icons/pull.png                 pull.png-20060808190051-fh6tnwcjzxozt4nc-5
  icons/pull16.png               pull16.png-20060808190051-fh6tnwcjzxozt4nc-6
  icons/push.png                 push.png-20060808190051-fh6tnwcjzxozt4nc-7
  icons/push16.png               push16.png-20060808190051-fh6tnwcjzxozt4nc-8
  icons/refresh.png              refresh.png-20060808190051-fh6tnwcjzxozt4nc-9
  ui.py                          ui.py-20060716163355-owuqwa9uhnlfsojs-1
  viz/branchwin.py               branchwin.py-20051016222514-15fd120652fcf25c
    ------------------------------------------------------------
    revno: 399.27.6
    revision-id: jelmer at samba.org-20080329024443-wuwnt6bs687z8zmf
    parent: daniel.schierbeck at gmail.com-20080328215535-09gnnsylwipqz1gu
    parent: jelmer at samba.org-20080328191227-plxs0ycul23lkcmm
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sat 2008-03-29 03:44:43 +0100
    message:
      Support showing multiple branches in bzr viz.
    modified:
      NEWS                           news-20070325173539-3va57o99cz3o57xe-1
    ------------------------------------------------------------
    revno: 399.27.5
    revision-id: daniel.schierbeck at gmail.com-20080328215535-09gnnsylwipqz1gu
    parent: jelmer at samba.org-20080327164534-5a07sfaor6wpimdi
    parent: jelmer at samba.org-20080328191227-plxs0ycul23lkcmm
    committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
    branch nick: trunk
    timestamp: Fri 2008-03-28 22:55:35 +0100
    message:
      Merged multihead branch.
    modified:
      __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
      branchview/linegraph.py        graph.py-20051016214152-ebf565808c860cf7
      viz/branchwin.py               branchwin.py-20051016222514-15fd120652fcf25c
        ------------------------------------------------------------
        revno: 399.29.2
        revision-id: jelmer at samba.org-20080328191227-plxs0ycul23lkcmm
        parent: jelmer at samba.org-20080327162729-eydrkliuspbqyu6x
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: multi-heads
        timestamp: Fri 2008-03-28 20:12:27 +0100
        message:
          Hide revision number column if more than one branch was specified.
        modified:
          viz/branchwin.py               branchwin.py-20051016222514-15fd120652fcf25c
        ------------------------------------------------------------
        revno: 399.29.1
        revision-id: jelmer at samba.org-20080327162729-eydrkliuspbqyu6x
        parent: jelmer at samba.org-20080314153635-xo30yuoowr2f9gcx
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: multi-heads
        timestamp: Thu 2008-03-27 17:27:29 +0100
        message:
          Support displaying multiple tips in viz.
        modified:
          __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
          branchview/linegraph.py        graph.py-20051016214152-ebf565808c860cf7
          viz/branchwin.py               branchwin.py-20051016222514-15fd120652fcf25c
    ------------------------------------------------------------
    revno: 399.27.4
    revision-id: jelmer at samba.org-20080327164534-5a07sfaor6wpimdi
    parent: jelmer at samba.org-20080327164043-2n4ho3azxvbm3y0h
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2008-03-27 17:45:34 +0100
    message:
      update my entries in NEWS.
    modified:
      NEWS                           news-20070325173539-3va57o99cz3o57xe-1
    ------------------------------------------------------------
    revno: 399.27.3
    revision-id: jelmer at samba.org-20080327164043-2n4ho3azxvbm3y0h
    parent: aaron at aaronbentley.com-20080320164130-6wykjegcfh6y08wi
    parent: jelmer at samba.org-20080327155648-e01nrvhr5msdvwt3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2008-03-27 17:40:43 +0100
    message:
      Merge remove of tortoise.
    removed:
      tortoise-bzr.py                tortoisebzr.py-20070309165449-24x2kud0ux6l6p7f-1
        ------------------------------------------------------------
        revno: 399.28.1
        revision-id: jelmer at samba.org-20080327155648-e01nrvhr5msdvwt3
        parent: jelmer at samba.org-20080314153635-xo30yuoowr2f9gcx
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: notortoise
        timestamp: Thu 2008-03-27 16:56:48 +0100
        message:
          Remove tortoisebzr from bzr-gtk, as it has its own project these days.
        removed:
          tortoise-bzr.py                tortoisebzr.py-20070309165449-24x2kud0ux6l6p7f-1
    ------------------------------------------------------------
    revno: 399.27.2
    revision-id: aaron at aaronbentley.com-20080320164130-6wykjegcfh6y08wi
    parent: aaron at aaronbentley.com-20080320160623-3xd9qmrvm37d7o03
    parent: szilveszter.farkas at gmail.com-20080320094607-ap2k5cqk6wsux5ua
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: bzr-gtk
    timestamp: Thu 2008-03-20 12:41:30 -0400
    message:
      Merge with trunk
    added:
      icons/commit.svg               commit.svg-20080320094353-cnzwesr8cyk57zbp-1
      icons/commit16.svg             commit16.svg-20080320094353-cnzwesr8cyk57zbp-2
      icons/diff16.svg               diff16.svg-20080320094353-cnzwesr8cyk57zbp-3
      po/ca.po                       ca.po-20080311170110-eyhlfg8lrcdba116-1
      po/cs.po                       cs.po-20080311170110-eyhlfg8lrcdba116-2
      po/de.po                       de.po-20080311170110-eyhlfg8lrcdba116-3
      po/en_GB.po                    en_gb.po-20080311170110-eyhlfg8lrcdba116-4
      po/es.po                       es.po-20080311170110-eyhlfg8lrcdba116-5
      po/fr.po                       fr.po-20080311170110-eyhlfg8lrcdba116-6
      po/hu.po                       hu.po-20080311170110-eyhlfg8lrcdba116-7
      po/id.po                       id.po-20080311170110-eyhlfg8lrcdba116-8
      po/it.po                       it.po-20080311170110-eyhlfg8lrcdba116-9
      po/ku.po                       ku.po-20080311170110-eyhlfg8lrcdba116-10
      po/pl.po                       pl.po-20080311170110-eyhlfg8lrcdba116-11
      po/pt_BR.po                    pt_br.po-20080311170110-eyhlfg8lrcdba116-12
      po/ru.po                       ru.po-20080311170110-eyhlfg8lrcdba116-13
      po/sr.po                       sr.po-20080311170110-eyhlfg8lrcdba116-14
      po/sv.po                       sv.po-20080311170110-eyhlfg8lrcdba116-15
    modified:
      NEWS                           news-20070325173539-3va57o99cz3o57xe-1
      __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
      branchbox.py                   branchbox.py-20070827120815-kh5cvk35vi7bf804-1
      icons/commit.png               commit.png-20060807164904-vgevuckgd4ah8m1q-4
      icons/commit16.png             commit16.png-20060808190051-fh6tnwcjzxozt4nc-1
      icons/diff.png                 diff.png-20060807164904-vgevuckgd4ah8m1q-5
      icons/diff16.png               diff16.png-20060808190051-fh6tnwcjzxozt4nc-2
      icons/log.png                  log.png-20060808190051-fh6tnwcjzxozt4nc-3
      icons/log16.png                log16.png-20060808190051-fh6tnwcjzxozt4nc-4
      icons/pull.png                 pull.png-20060808190051-fh6tnwcjzxozt4nc-5
      icons/pull16.png               pull16.png-20060808190051-fh6tnwcjzxozt4nc-6
      icons/push.png                 push.png-20060808190051-fh6tnwcjzxozt4nc-7
      icons/push16.png               push16.png-20060808190051-fh6tnwcjzxozt4nc-8
      icons/refresh.png              refresh.png-20060808190051-fh6tnwcjzxozt4nc-9
      mergedirective.py              mergedirective.py-20070805005518-41uc6l5dle4e2trw-1
      viz/branchwin.py               branchwin.py-20051016222514-15fd120652fcf25c
        ------------------------------------------------------------
        revno: 399.9.33
        revision-id: szilveszter.farkas at gmail.com-20080320094607-ap2k5cqk6wsux5ua
        parent: jelmer at samba.org-20080314153635-xo30yuoowr2f9gcx
        committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
        branch nick: tango-icons-v2
        timestamp: Thu 2008-03-20 10:46:07 +0100
        message:
          New Tango icons by Simon Pascal Klein (GPL licensed)
        added:
          icons/commit.svg               commit.svg-20080320094353-cnzwesr8cyk57zbp-1
          icons/commit16.svg             commit16.svg-20080320094353-cnzwesr8cyk57zbp-2
          icons/diff16.svg               diff16.svg-20080320094353-cnzwesr8cyk57zbp-3
        modified:
          NEWS                           news-20070325173539-3va57o99cz3o57xe-1
          icons/commit.png               commit.png-20060807164904-vgevuckgd4ah8m1q-4
          icons/commit16.png             commit16.png-20060808190051-fh6tnwcjzxozt4nc-1
          icons/diff.png                 diff.png-20060807164904-vgevuckgd4ah8m1q-5
          icons/diff16.png               diff16.png-20060808190051-fh6tnwcjzxozt4nc-2
          icons/log.png                  log.png-20060808190051-fh6tnwcjzxozt4nc-3
          icons/log16.png                log16.png-20060808190051-fh6tnwcjzxozt4nc-4
          icons/pull.png                 pull.png-20060808190051-fh6tnwcjzxozt4nc-5
          icons/pull16.png               pull16.png-20060808190051-fh6tnwcjzxozt4nc-6
          icons/push.png                 push.png-20060808190051-fh6tnwcjzxozt4nc-7
          icons/push16.png               push16.png-20060808190051-fh6tnwcjzxozt4nc-8
          icons/refresh.png              refresh.png-20060808190051-fh6tnwcjzxozt4nc-9
    ------------------------------------------------------------
    revno: 399.27.1
    revision-id: aaron at aaronbentley.com-20080320160623-3xd9qmrvm37d7o03
    parent: aaron at aaronbentley.com-20080311131828-ypof288xwih1r3x2
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: bzr-gtk
    timestamp: Thu 2008-03-20 12:06:23 -0400
    message:
      Avoid division error when current or total is None
    modified:
      ui.py                          ui.py-20060716163355-owuqwa9uhnlfsojs-1

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



More information about the bazaar-commits mailing list