Rev 45: Merge 0.4.1. in file:///data/jelmer/bzr-rebase/debian/
Jelmer Vernooij
jelmer at samba.org
Mon Sep 1 16:14:28 BST 2008
At file:///data/jelmer/bzr-rebase/debian/
------------------------------------------------------------
revno: 45
revision-id: jelmer at samba.org-20080901151427-vh6txuv269rjt2yb
parent: jelmer at samba.org-20080809124632-6bf1ccysb9pg7gu6
parent: jelmer at samba.org-20080901151233-9jkac3hfy3g18if6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Mon 2008-09-01 17:14:27 +0200
message:
Merge 0.4.1.
modified:
Makefile makefile-20080330190326-ad4of1yovo6un1xf-1
NEWS news-20070721005510-kbjm9yxqoeczq9fl-1
__init__.py __init__.py-20070626215909-fi0s39bkwxn4gcto-1
debian/changelog changelog-20070714212400-6fqzhl97r51iwf29-1
rebase.py rebase.py-20070626221123-ellanmf93nw8z9r1-1
setup.py setup.py-20070714212903-tclv52yx8cm6vg1c-1
test_rebase.py test_rebase.py-20070626221123-ellanmf93nw8z9r1-2
------------------------------------------------------------
revno: 24.1.80
tags: bzr-rebase-0.4.1
revision-id: jelmer at samba.org-20080901151233-9jkac3hfy3g18if6
parent: jelmer at samba.org-20080831203021-42yc10rrvcp08ybl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-09-01 17:12:33 +0200
message:
release 0.4.1.
modified:
NEWS news-20070721005510-kbjm9yxqoeczq9fl-1
__init__.py __init__.py-20070626215909-fi0s39bkwxn4gcto-1
setup.py setup.py-20070714212903-tclv52yx8cm6vg1c-1
------------------------------------------------------------
revno: 24.1.79
revision-id: jelmer at samba.org-20080831203021-42yc10rrvcp08ybl
parent: vmiklos at frugalware.org-20080803083633-ypioh4lxc20c30s0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-08-31 22:30:21 +0200
message:
Loosen requirements about text parents a bit - check text sha1s instead.
modified:
rebase.py rebase.py-20070626221123-ellanmf93nw8z9r1-1
test_rebase.py test_rebase.py-20070626221123-ellanmf93nw8z9r1-2
------------------------------------------------------------
revno: 24.1.78
revision-id: vmiklos at frugalware.org-20080803083633-ypioh4lxc20c30s0
parent: jelmer at samba.org-20080802131509-2o2tt58hewqo510v
committer: Miklos Vajna <vmiklos at frugalware.org>
branch nick: bzr-rebase-trunk
timestamp: Sun 2008-08-03 10:36:33 +0200
message:
Add DESTDIR support to Makefile to make distro's life easier.
modified:
Makefile makefile-20080330190326-ad4of1yovo6un1xf-1
=== modified file 'Makefile'
--- a/Makefile 2008-05-29 12:14:54 +0000
+++ b/Makefile 2008-08-03 08:36:33 +0000
@@ -5,6 +5,7 @@
CTAGS ?= ctags
PYLINT ?= pylint
TESTS ?=
+DESTDIR ?=
all:: build
@@ -12,7 +13,11 @@
$(SETUP) build
install::
+ifneq ($(DESTDIR),)
+ $(SETUP) install --root "$(DESTDIR)"
+else
$(SETUP) install
+endif
clean::
$(SETUP) clean
=== modified file 'NEWS'
--- a/NEWS 2008-08-02 13:15:09 +0000
+++ b/NEWS 2008-09-01 15:12:33 +0000
@@ -1,3 +1,13 @@
+0.4.1 2008-09-01
+
+ BUG FIXES
+
+ * Loosen check of text parents a bit (required for bzr-svn).
+
+ CHANGES
+
+ * Support DESTDIR in Makefile.
+
0.4 2008-08-02
CHANGES
=== modified file '__init__.py'
--- a/__init__.py 2008-08-02 13:14:50 +0000
+++ b/__init__.py 2008-09-01 15:12:33 +0000
@@ -28,7 +28,7 @@
from bzrlib.option import Option
from bzrlib.trace import info, warning
-version_info = (0, 4, 0, 'dev', 0)
+version_info = (0, 4, 1, 'final', 0)
if version_info[3] == 'final':
version_string = '%d.%d.%d' % version_info[:3]
else:
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-08-09 12:46:32 +0000
+++ b/debian/changelog 2008-09-01 15:14:27 +0000
@@ -1,3 +1,9 @@
+bzr-rebase (0.4.1-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at samba.org> Mon, 01 Sep 2008 17:14:01 +0200
+
bzr-rebase (0.4-1) experimental; urgency=low
* New upstream version.
=== modified file 'rebase.py'
--- a/rebase.py 2008-07-19 08:08:45 +0000
+++ b/rebase.py 2008-08-31 20:30:21 +0000
@@ -380,7 +380,7 @@
# make sure at least one of the new parents contains
# the ie.file_id, ie.revision combination
if (len(filter(lambda inv: ie.file_id in inv and
- inv[ie.file_id].revision == ie.revision, parent_invs))
+ inv[ie.file_id].text_sha1 == ie.text_sha1, parent_invs))
== 0):
raise ReplayParentsInconsistent(ie.file_id, ie.revision)
i += 1
=== modified file 'setup.py'
--- a/setup.py 2008-05-11 18:52:36 +0000
+++ b/setup.py 2008-09-01 15:12:33 +0000
@@ -5,7 +5,7 @@
setup(name='bzr-rebase',
description='Rebase plugin for Bazaar',
keywords='plugin bzr rebase',
- version='0.4',
+ version='0.4.1',
url='http://bazaar-vcs.org/Rebase',
download_url='http://bazaar-vcs.org/Rebase',
license='GPLv3 or later',
=== modified file 'test_rebase.py'
--- a/test_rebase.py 2008-07-19 08:08:45 +0000
+++ b/test_rebase.py 2008-08-31 20:30:21 +0000
@@ -387,14 +387,14 @@
def test_two_revisions(self):
wt = self.make_branch_and_tree("old")
- self.build_tree(['old/afile', 'old/notherfile'])
+ self.build_tree_contents([('old/afile', 'afilecontents'), ('old/notherfile', 'notherfilecontents')])
wt.add(["afile"], ["somefileid"])
wt.commit("bla", rev_id="oldparent")
wt.add(["notherfile"])
wt.commit("bla", rev_id="oldcommit")
oldrepos = wt.branch.repository
wt = self.make_branch_and_tree("new")
- self.build_tree(['new/afile', 'new/notherfile'])
+ self.build_tree_contents([('new/afile', 'afilecontents'), ('new/notherfile', 'notherfilecontents')])
wt.add(["afile"], ["afileid"])
wt.commit("bla", rev_id="newparent")
wt.branch.repository.fetch(oldrepos)
@@ -435,7 +435,9 @@
def test_multi_revisions(self):
wt = self.make_branch_and_tree("old")
- self.build_tree(['old/afile', 'old/sfile', 'old/notherfile'])
+ self.build_tree_contents([('old/afile', 'afilecontent'),
+ ('old/sfile', 'sfilecontent'),
+ ('old/notherfile', 'notherfilecontent')])
wt.add(['sfile'])
wt.add(["afile"], ["somefileid"])
wt.commit("bla", rev_id="oldgrandparent")
@@ -445,7 +447,9 @@
wt.commit("bla", rev_id="oldcommit")
oldrepos = wt.branch.repository
wt = self.make_branch_and_tree("new")
- self.build_tree(['new/afile', 'new/sfile', 'new/notherfile'])
+ self.build_tree_contents([('new/afile', 'afilecontent'),
+ ('new/sfile', 'sfilecontent'),
+ ('new/notherfile', 'notherfilecontent')])
wt.add(['sfile'])
wt.add(["afile"], ["afileid"])
wt.commit("bla", rev_id="newgrandparent")
More information about the bazaar-commits
mailing list