Rev 1133: Fix another test. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/cext

------------------------------------------------------------
revno: 1133
revision-id: jelmer at samba.org-20080825044215-l9uwr0u7347dz3pd
parent: jelmer at samba.org-20080825033044-wg6de65b1dkfrels
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Mon 2008-08-25 06:42:15 +0200
message:
  Fix another test.
modified:
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'workingtree.py'
--- a/workingtree.py	2008-08-25 03:30:44 +0000
+++ b/workingtree.py	2008-08-25 04:42:15 +0000
@@ -425,7 +425,7 @@
         wc = self._get_wc(write_lock=True)
         try:
             wc.process_committed(self.abspath("").rstrip("/"), 
-                          False, entry.revision, 
+                          False, rev,
                           svn_revprops[properties.PROP_REVISION_DATE], 
                           svn_revprops[properties.PROP_REVISION_AUTHOR])
             update_settings(wc, "")
@@ -610,8 +610,9 @@
         return [self.base_revid] + self.pending_merges()
 
     def set_parent_ids(self, revision_ids, allow_lefmost_as_ghost=False):
-        self.base_revid = revision_ids[0]
-        self.set_pending_merges(revision_ids[1:])
+        self.set_last_revision(revision_ids[0])
+        if self.pending_merges() != revision_ids[1:]:
+            self.set_pending_merges(revision_ids[1:])
 
     def pending_merges(self):
         merged = self._get_bzr_merges(self._get_base_branch_props()).splitlines()