[Pkg-bazaar-commits] ./bzr-rebase/unstable r49: new upstream release.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 49
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Tue 2008-11-18 01:24:05 +0100
message:
  new upstream release.
modified:
  NEWS
  __init__.py
  debian/changelog
  setup.py
    ------------------------------------------------------------
    revno: 24.1.85
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: rebase
    timestamp: Tue 2008-10-21 14:54:17 +0100
    message:
      Fix option grammar
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 24.1.86
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2008-10-30 13:26:09 +0100
    message:
      Use parent location as default rather than pull location.
    modified:
      NEWS
      __init__.py
    ------------------------------------------------------------
    revno: 24.1.87
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Tue 2008-11-18 00:44:35 +0100
    message:
      Hide replay.
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 24.1.88
    tags: bzr-rebase-0.4.2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Tue 2008-11-18 01:22:29 +0100
    message:
      release 0.4.2
    modified:
      NEWS
      __init__.py
      setup.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-09-01 17:51:22 +0000
+++ b/NEWS	2008-11-18 00:22:29 +0000
@@ -1,10 +1,14 @@
-0.4.2	UNRELEASED
+0.4.2	2008-11-18
 
  FEATURES
 
   * Will automatically pull if it's not possible to rebase. 
     (#240204)
 
+  * Use parent location as default rather than push location.
+
+  * Hide "replay" command.
+
 0.4.1	2008-09-01
 
  BUG FIXES

=== modified file '__init__.py'
--- a/__init__.py	2008-09-01 17:51:22 +0000
+++ b/__init__.py	2008-11-18 00:22:29 +0000
@@ -28,7 +28,7 @@
 from bzrlib.option import Option
 from bzrlib.trace import info, warning
 
-version_info = (0, 4, 1, 'final', 0)
+version_info = (0, 4, 2, 'final', 0)
 if version_info[3] == 'final':
     version_string = '%d.%d.%d' % version_info[:3]
 else:
@@ -98,7 +98,7 @@
         Option('always-rebase-merges',
             help="Don't skip revisions that merge already present revisions."),
         Option('pending-merges',
-            help="Rebase pending merges onto local branch"),
+            help="Rebase pending merges onto local branch."),
         Option('onto', help='Different revision to replay onto.',
             type=str)]
     
@@ -124,9 +124,7 @@
             if pending_merges:
                 upstream_location = "."
             else:
-                upstream_location = wt.branch.get_push_location()
-                if upstream_location is None:
-                    upstream_location = wt.branch.get_parent()
+                upstream_location = wt.branch.get_parent()
                 info("Rebasing on %s" % upstream_location)
         upstream = Branch.open_containing(upstream_location)[0]
         upstream_repository = upstream.repository
@@ -326,6 +324,7 @@
     
     takes_options = ['revision', 'merge-type']
     takes_args = ['location']
+    hidden = True
 
     def run(self, location, revision=None, merge_type=None):
         from bzrlib.branch import Branch

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-10-10 01:42:49 +0000
+++ b/debian/changelog	2008-11-18 00:24:05 +0000
@@ -1,3 +1,9 @@
+bzr-rebase (0.4.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Tue, 18 Nov 2008 01:23:51 +0100
+
 bzr-rebase (0.4.1+bzr108-1) experimental; urgency=low
 
   * Package new upstream snapshot required for bzr-svn.

=== modified file 'setup.py'
--- a/setup.py	2008-09-01 15:12:33 +0000
+++ b/setup.py	2008-11-18 00:22:29 +0000
@@ -5,7 +5,7 @@
 setup(name='bzr-rebase',
       description='Rebase plugin for Bazaar',
       keywords='plugin bzr rebase',
-      version='0.4.1',
+      version='0.4.2',
       url='http://bazaar-vcs.org/Rebase',
       download_url='http://bazaar-vcs.org/Rebase',
       license='GPLv3 or later',