[Pkg-bazaar-commits] r30 ./bzr-rebase/unstable: Merge release of 0.2.
Jelmer Vernooij
jelmer at samba.org
Sat Oct 20 12:00:18 UTC 2007
------------------------------------------------------------
revno: 30
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Sat 2007-10-20 14:00:18 +0200
message:
Merge release of 0.2.
added:
.bzrignore
AUTHORS
COPYING
NEWS
modified:
README
__init__.py
debian/changelog
debian/control
maptree.py
rebase.py
setup.py
test_blackbox.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2007-07-17 18:16:00 +0200
message:
Ignore build file.
added:
.bzrignore
------------------------------------------------------------
revno: 24.1.3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2007-07-18 18:22:16 +0200
message:
Note revision property 'rebase-of', add explanation of use of pregenerated revision ids.
modified:
README
rebase.py
------------------------------------------------------------
revno: 24.1.4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2007-07-21 02:44:47 +0200
message:
Add license file.
added:
COPYING
------------------------------------------------------------
revno: 24.1.5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2007-07-21 03:14:32 +0200
message:
Add --dry-run option to rebase command.
added:
NEWS
modified:
__init__.py
------------------------------------------------------------
revno: 24.1.6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2007-07-21 03:18:18 +0200
message:
Add test demonstrating issues rebasing revisions with multiple parents. (maybe same cause as #126743).
modified:
test_blackbox.py
------------------------------------------------------------
revno: 24.1.7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2007-07-25 00:20:00 +0200
message:
Refactor generate_transpose_plan() to not take a repository object but
rather just a graph - makes testing a lot easier.
modified:
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2007-07-25 19:24:00 +0200
message:
Properly detect invalid snapshot replays.
modified:
maptree.py
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2007-07-25 20:02:00 +0200
message:
Ignore tags file
modified:
.bzrignore
------------------------------------------------------------
revno: 24.1.10
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-07-26 01:01:56 +0200
message:
Some more tests.
modified:
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.11
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-07-26 01:24:44 +0200
message:
Make revid_renames argument mandatory.
modified:
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.12
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-07-26 22:06:05 +0100
message:
Fix compatibility with bzr 0.19.
modified:
NEWS
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.13
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-07-26 23:00:10 +0100
message:
Store parents correctly.
modified:
NEWS
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.14
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-07-27 00:49:39 +0100
message:
Handle directories in revert.
modified:
rebase.py
------------------------------------------------------------
revno: 24.1.15
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-07-27 02:31:14 +0100
message:
Some more refactoring, add test that demonstrates #126743.
modified:
__init__.py
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.16
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-07-27 03:07:26 +0100
message:
Adjust expectations.
modified:
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.17
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-08-02 19:16:25 +0100
message:
Add some commits from my flight from Dublin.
modified:
NEWS
__init__.py
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.16.1.1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-08-02 11:49:41 +0100
message:
Split out function for determining rebase base.
modified:
__init__.py
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.16.1.2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-08-02 13:15:10 +0100
message:
More work using proper merge bases.
modified:
NEWS
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.16.1.3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-08-02 19:15:00 +0100
message:
Add stop_revid argumen to generate_simple_plan.
modified:
__init__.py
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.18
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-08-02 19:30:49 +0100
message:
Support the -r argument to rebase.
modified:
NEWS
__init__.py
test_blackbox.py
------------------------------------------------------------
revno: 24.1.19
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-08-02 20:24:26 +0100
message:
Factor out common revid code - maybe some of this can use aaron's common ancestor code instead?
modified:
__init__.py
rebase.py
------------------------------------------------------------
revno: 24.1.20
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2007-09-05 01:27:45 +0200
message:
Update for newer API.
modified:
maptree.py
------------------------------------------------------------
revno: 24.1.21
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2007-09-09 01:17:10 +0200
message:
Fix 0.90 compatibility.
modified:
maptree.py
------------------------------------------------------------
revno: 24.1.22
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2007-09-24 01:33:42 +0200
message:
Set version info.
modified:
__init__.py
------------------------------------------------------------
revno: 24.1.23
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2007-10-17 03:49:03 +0200
message:
Add progress bar, fix compatibility with bzr.dev.
modified:
maptree.py
rebase.py
------------------------------------------------------------
revno: 24.1.24
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-10-18 21:56:52 +0200
message:
Add replay command.
modified:
NEWS
__init__.py
rebase.py
------------------------------------------------------------
revno: 24.1.25
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-10-18 23:11:37 +0200
message:
Fix locking.
modified:
NEWS
__init__.py
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.26
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-10-18 23:34:58 +0200
message:
Fix inconsistent parent errors.
modified:
rebase.py
------------------------------------------------------------
revno: 24.1.27
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-10-18 23:59:50 +0200
message:
Give proper warning when there is no common base.
modified:
NEWS
__init__.py
test_blackbox.py
------------------------------------------------------------
revno: 24.1.28
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-10-19 00:32:19 +0200
message:
Add docstrings, update NEWS.
modified:
NEWS
rebase.py
------------------------------------------------------------
revno: 24.1.29
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-10-19 01:19:45 +0200
message:
Add AUTHORS file.
added:
AUTHORS
------------------------------------------------------------
revno: 24.1.30
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-10-19 02:27:20 +0200
message:
Move determination of merge base to separate function.
modified:
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.31
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-10-19 03:43:56 +0200
message:
Add functinality for skipping duplicate merges.
modified:
rebase.py
test_rebase.py
------------------------------------------------------------
revno: 24.1.32
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-10-19 12:39:24 +0200
message:
Fix test.
modified:
test_rebase.py
------------------------------------------------------------
revno: 24.1.33
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-10-19 13:08:36 +0200
message:
Allow overridding whether merges of already merged revisions should be replayed.
modified:
NEWS
__init__.py
rebase.py
------------------------------------------------------------
revno: 24.1.34
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-10-19 13:25:28 +0200
message:
Raise exception about pending changes /before/ writing plan.
modified:
NEWS
__init__.py
------------------------------------------------------------
revno: 24.1.35
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-10-19 13:28:48 +0200
message:
Release 0.2.
modified:
NEWS
__init__.py
setup.py
-------------- next part --------------
Diff too large for email (1782 lines, the limit is 1000).
More information about the Pkg-bazaar-commits
mailing list