Rev 199: Merge upstream. in file:///home/jelmer/bzr-gtk/trunk/
Jelmer Vernooij
jelmer at samba.org
Sat May 19 17:21:15 BST 2007
At file:///home/jelmer/bzr-gtk/trunk/
------------------------------------------------------------
revno: 199
revision-id: jelmer at samba.org-20070519162110-qw0pkevul1iet036
parent: jelmer at samba.org-20070519161511-49bky3avi2uh9uvq
parent: szilveszter.farkas at gmail.com-20070516105603-22cy2qb5qxkw8zbc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2007-05-19 17:21:10 +0100
message:
Merge upstream.
modified:
NEWS news-20070325173539-3va57o99cz3o57xe-1
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
branch.py branch.py-20060718221951-cc4ts04p4d84mjth-1
checkout.py checkout.py-20060731181533-e0x1bgv7wum466kj-1
cmenu.ui cmenu.ui-20060802203254-iutrr86m6ykp6h8c-1
olive.glade olive.glade-20060716235030-brgx1ry6lt6z8044-1
olive/__init__.py __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
olive/menu.py menu.py-20060803101046-9idg5lu81o53za8y-1
setup.py setup.py-20060716162505-h2isrtlg8lmlg2o2-1
status.py status.py-20060803143043-mmdp58hu3hauy0xh-1
------------------------------------------------------------
revno: 195.1.7
merged: szilveszter.farkas at gmail.com-20070516105603-22cy2qb5qxkw8zbc
parent: szilveszter.farkas at gmail.com-20070515145300-j8gdeqxjlmokilml
parent: szilveszter.farkas at gmail.com-20070516105414-4t9pfs5t9ihkb5v0
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Wed 2007-05-16 11:56:03 +0100
message:
Merged the multi-sortable-columns branch.
------------------------------------------------------------
revno: 195.1.5.2.5
merged: szilveszter.farkas at gmail.com-20070516105414-4t9pfs5t9ihkb5v0
parent: szilveszter.farkas at gmail.com-20070516085824-ec239a2gbdus3kef
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: multi-sortable-columns
timestamp: Wed 2007-05-16 11:54:14 +0100
message:
Updated NEWS.
------------------------------------------------------------
revno: 195.1.5.2.4
merged: szilveszter.farkas at gmail.com-20070516085824-ec239a2gbdus3kef
parent: szilveszter.farkas at gmail.com-20070516081755-8rok1lm91i3zv3oa
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: multi-sortable-columns
timestamp: Wed 2007-05-16 09:58:24 +0100
message:
The Windows drive selector was moved to the location bar.
Cleaned up setup.py a bit.
------------------------------------------------------------
revno: 195.1.5.2.3
merged: szilveszter.farkas at gmail.com-20070516081755-8rok1lm91i3zv3oa
parent: szilveszter.farkas at gmail.com-20070516081519-yh3xju08ddgvd2hn
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: multi-sortable-columns
timestamp: Wed 2007-05-16 09:17:55 +0100
message:
Added NEWS entry.
------------------------------------------------------------
revno: 195.1.5.2.2
merged: szilveszter.farkas at gmail.com-20070516081519-yh3xju08ddgvd2hn
parent: szilveszter.farkas at gmail.com-20070516001646-tj5owhwdm36ys546
parent: szilveszter.farkas at gmail.com-20070515145300-j8gdeqxjlmokilml
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: multi-sortable-columns
timestamp: Wed 2007-05-16 09:15:19 +0100
message:
Merge from trunk.
------------------------------------------------------------
revno: 195.1.5.2.1
merged: szilveszter.farkas at gmail.com-20070516001646-tj5owhwdm36ys546
parent: szilveszter.farkas at gmail.com-20070514203603-5wr67dzjcu7ia4uo
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: multi-sortable-columns
timestamp: Wed 2007-05-16 01:16:46 +0100
message:
Implemented sortable columns, and there are also some new columns
- size
- last modification
Sorting is done by the TreeModel, not "by hand" (via list.sort()).
------------------------------------------------------------
revno: 195.1.6
merged: szilveszter.farkas at gmail.com-20070515145300-j8gdeqxjlmokilml
parent: szilveszter.farkas at gmail.com-20070514203603-5wr67dzjcu7ia4uo
parent: szilveszter.farkas at gmail.com-20070515145133-e1y5q3lo99col72j
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Tue 2007-05-15 15:53:00 +0100
message:
Scan the branch only if the entry has lost the focus. (Fixed: #93653)
------------------------------------------------------------
revno: 195.1.5.1.2
merged: szilveszter.farkas at gmail.com-20070515145133-e1y5q3lo99col72j
parent: szilveszter.farkas at gmail.com-20070515144949-at70jvu5q26z8lnu
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: 93653
timestamp: Tue 2007-05-15 15:51:33 +0100
message:
Added NEWS entry.
------------------------------------------------------------
revno: 195.1.5.1.1
merged: szilveszter.farkas at gmail.com-20070515144949-at70jvu5q26z8lnu
parent: szilveszter.farkas at gmail.com-20070514203603-5wr67dzjcu7ia4uo
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: 93653
timestamp: Tue 2007-05-15 15:49:49 +0100
message:
Scan the branch only if the entry has lost the focus. (Fixed: #93653)
------------------------------------------------------------
revno: 195.1.5
merged: szilveszter.farkas at gmail.com-20070514203603-5wr67dzjcu7ia4uo
parent: szilveszter.farkas at gmail.com-20070514105600-h6uj7208x93c6xyv
parent: szilveszter.farkas at gmail.com-20070514172033-z0yhlsjo8uwmpscy
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Mon 2007-05-14 21:36:03 +0100
message:
Added Annotate to the right context menu and fixed a problem with Diff.
------------------------------------------------------------
revno: 195.1.4.1.1
merged: szilveszter.farkas at gmail.com-20070514172033-z0yhlsjo8uwmpscy
parent: szilveszter.farkas at gmail.com-20070514105600-h6uj7208x93c6xyv
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: olive-annotate-context
timestamp: Mon 2007-05-14 18:20:33 +0100
message:
Added Annotate to the right context menu + fixed Diff in that menu.
------------------------------------------------------------
revno: 195.1.4
merged: szilveszter.farkas at gmail.com-20070514105600-h6uj7208x93c6xyv
parent: szilveszter.farkas at gmail.com-20070511082732-s0s8q9ahjdfytu9s
parent: szilveszter.farkas at gmail.com-20070514105440-e5fhlftlp3r0bgmr
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Mon 2007-05-14 11:56:00 +0100
message:
Fixed Status in Olive.
------------------------------------------------------------
revno: 195.1.3.1.1
merged: szilveszter.farkas at gmail.com-20070514105440-e5fhlftlp3r0bgmr
parent: szilveszter.farkas at gmail.com-20070511082732-s0s8q9ahjdfytu9s
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: olive-status-traceback
timestamp: Mon 2007-05-14 11:54:40 +0100
message:
Fixed Branch -> Status in Olive (no more traceback).
------------------------------------------------------------
revno: 195.1.3
merged: szilveszter.farkas at gmail.com-20070511082732-s0s8q9ahjdfytu9s
parent: szilveszter.farkas at gmail.com-20070511082624-dm7hnfuz5d62bwf2
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Fri 2007-05-11 10:27:32 +0200
message:
Set version number to 0.17.0
------------------------------------------------------------
revno: 195.1.2
merged: szilveszter.farkas at gmail.com-20070511082624-dm7hnfuz5d62bwf2
parent: szilveszter.farkas at gmail.com-20070511082232-scby91mif1xux1pc
parent: szilveszter.farkas at gmail.com-20070511082540-bm962u17vufwz3xr
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Fri 2007-05-11 10:26:24 +0200
message:
Merge the fix for #113394.
------------------------------------------------------------
revno: 195.2.3
merged: szilveszter.farkas at gmail.com-20070511082540-bm962u17vufwz3xr
parent: szilveszter.farkas at gmail.com-20070511082333-n6i7057l2x5spc7d
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk.113394
timestamp: Fri 2007-05-11 10:25:40 +0200
message:
Added NEWS entry.
------------------------------------------------------------
revno: 195.2.2
merged: szilveszter.farkas at gmail.com-20070511082333-n6i7057l2x5spc7d
parent: szilveszter.farkas at gmail.com-20070508175538-stjo6nzpe03f5kvl
parent: szilveszter.farkas at gmail.com-20070511082232-scby91mif1xux1pc
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk.113394
timestamp: Fri 2007-05-11 10:23:33 +0200
message:
Merge from trunk.
------------------------------------------------------------
revno: 195.2.1
merged: szilveszter.farkas at gmail.com-20070508175538-stjo6nzpe03f5kvl
parent: jelmer at samba.org-20070430202139-3ygkc5q5d04fish1
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk.113394
timestamp: Tue 2007-05-08 19:55:38 +0200
message:
NotBranchError exception shouldn't be handled. (Fixes: #113394)
------------------------------------------------------------
revno: 195.1.1
tags: bzr-gtk-0.16.0
merged: szilveszter.farkas at gmail.com-20070511082232-scby91mif1xux1pc
parent: jelmer at samba.org-20070430202139-3ygkc5q5d04fish1
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Fri 2007-05-11 10:22:32 +0200
message:
Added 0.16.0 release date.
Diff too large for email (7266 lines, the limit is 1000).
More information about the bazaar-commits
mailing list