Rev 1022: Merge 0.4. in file:///data/jelmer/bzr-svn/pyrex/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1022
revision-id: jelmer at samba.org-20080321130920-zk7tetjssf6slxia
parent: jelmer at samba.org-20080321130135-6jfpe16ffcxr3lvk
parent: jelmer at samba.org-20080321130751-90h9dt4wbtwbh7s9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Fri 2008-03-21 14:09:20 +0100
message:
  Merge 0.4.
modified:
  Makefile                       makefile.other-20080311181537-5svhje3v1flh1n4f-1
  tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
    ------------------------------------------------------------
    revno: 950.1.7
    revision-id: jelmer at samba.org-20080321130751-90h9dt4wbtwbh7s9
    parent: jelmer at samba.org-20080321031902-tx2f9kddff5gvoe6
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-03-21 14:07:51 +0100
    message:
      Fix test run symlinks.
    modified:
      Makefile                       makefile.other-20080311181537-5svhje3v1flh1n4f-1
      tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
=== modified file 'Makefile'
--- a/Makefile	2008-03-18 21:52:58 +0000
+++ b/Makefile	2008-03-21 13:09:20 +0000
@@ -28,7 +28,7 @@
 	mkdir -p $@
 
 $(TMP_PLUGINS_DIR)/svn: build-inplace $(TMP_PLUGINS_DIR)
-	ln -sf `pwd` $(TMP_PLUGINS_DIR)/svn
+	ln -sf $@ `pwd`
 
 check:: $(TMP_PLUGINS_DIR)/svn
 	BZR_PLUGIN_PATH=$(TMP_PLUGINS_DIR) $(DEBUGGER) $(PYTHON) $(BZR) selftest $(TEST_OPTIONS) $(TESTS)

=== modified file 'tests/test_push.py'
--- a/tests/test_push.py	2008-03-16 04:31:39 +0000
+++ b/tests/test_push.py	2008-03-21 13:09:20 +0000
@@ -743,15 +743,19 @@
         # Merge 
         self.build_tree({'c/registry/generic.c': "DE"})
         bzrwt.add_pending_merge(merge_revid)
+        self.assertEquals(bzrwt.get_parent_ids()[1], merge_revid)
         revid2 = bzrwt.commit("Merge something", rev_id="mergerevid")
-
+        bzr_parents = bzrwt.branch.repository.revision_parents(revid2)
         trunk = Branch.open(repos_url + "/trunk")
         trunk.pull(bzrwt.branch)
 
+        self.assertEquals(bzr_parents, 
+                trunk.repository.revision_parents(revid2))
+
         self.assertEquals([revid1, revid2], trunk.revision_history())
         self.client_update("dc")
         self.assertEquals(
-                '1 initialrevid\n2 mergerevid\n',
+                '1 initialrevid\n',
                 self.client_get_prop("dc/trunk", SVN_PROP_BZR_REVISION_ID+"trunk0"))