Rev 1774: Merge 0.4. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1774
revision-id: jelmer at samba.org-20080902002700-u5ycoktrqlh50bz3
parent: jelmer at samba.org-20080901233056-r6yx7gx05qpsw0wx
parent: jelmer at samba.org-20080902002539-zdjx73dzcob87a5h
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-09-02 02:27:00 +0200
message:
  Merge 0.4.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
  setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 1669.1.30
    revision-id: jelmer at samba.org-20080902002539-zdjx73dzcob87a5h
    parent: jelmer at samba.org-20080901164852-4jal30xlnsjtdm6b
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-09-02 02:25:39 +0200
    message:
      Use apr-1-config only, not apr-config.
    modified:
      setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 1669.1.29
    revision-id: jelmer at samba.org-20080901164852-4jal30xlnsjtdm6b
    parent: jelmer at samba.org-20080901145824-p7el76kzv3092suz
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-09-01 18:48:52 +0200
    message:
      Add blackbox test for pack.
    modified:
      tests/test_blackbox.py         test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
    ------------------------------------------------------------
    revno: 1669.1.28
    revision-id: jelmer at samba.org-20080901145824-p7el76kzv3092suz
    parent: jelmer at samba.org-20080901145741-ffxw9t868r8yb6oa
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-09-01 16:58:24 +0200
    message:
      Start on 0.4.13.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      setup.py                       setup.py-20060502115218-86950492da22353f
=== modified file 'NEWS'
--- a/NEWS	2008-09-01 20:38:56 +0000
+++ b/NEWS	2008-09-02 00:27:00 +0000
@@ -35,6 +35,8 @@
 
     + Standard commit code provides commit notification. (#79333)
 
+bzr-svn 0.4.13	UNRELEASED
+
 bzr-svn 0.4.12	2008-09-01
 
   BUG FIXES

=== modified file 'revmeta.py'
--- a/revmeta.py	2008-09-01 23:30:56 +0000
+++ b/revmeta.py	2008-09-02 00:27:00 +0000
@@ -64,6 +64,7 @@
     def get_lhs_parent(self, mapping):
         lhs_parent = mapping.get_lhs_parent(self.branch_path, self.revprops, self.get_changed_fileprops())
         if lhs_parent is None:
+            # FIXME: Avoid calling lhs_revision_parent but use paths
             # Determine manually
             lhs_parent = self.repository.lhs_revision_parent(self.branch_path, self.revnum, mapping)
         return lhs_parent

=== modified file 'setup.py'
--- a/setup.py	2008-09-01 15:06:42 +0000
+++ b/setup.py	2008-09-02 00:27:00 +0000
@@ -61,10 +61,8 @@
 def apr_config(arg):
     apr_config_cmd = os.getenv("APR_CONFIG")
     if apr_config_cmd is None:
-        cmds = ["apr-config", "apr-1-config", "/usr/local/apr/bin/apr-config",
-                "/usr/local/apr/bin/apr-1-config", 
-                "/opt/local/bin/apr-1-config",
-                "/usr/local/bin/apr-config", ]
+        cmds = ["apr-1-config", "/usr/local/apr/bin/apr-1-config", 
+                "/opt/local/bin/apr-1-config", ]
         for cmd in cmds:
             try:
                 res = run_cmd(cmd, arg)