Changeset 56

Timestamp:

Feb 23, 2010 7:56:07 PM (15 years ago)

Author:

retracile

Message:

Mergebot: pair of bugfixes

Location:

mergebot/trunk

Files:

• mergebot/svn.py (modified) (1 diff)
• utils/test.py (modified) (1 diff)

mergebot/trunk/mergebot/svn.py

@@ -158 +158 @@
                     "from svn merge operation; the 5th character should " \
                     "always be a space.  Invalid output line was %r.\nFull output was: %r." % (line, output)
-                filename = line[5:-1] # (strip trailing newline)
+                filename = line[5:]
                 status = line[:4].rstrip()
             results.append((status, filename))

mergebot/trunk/utils/test.py

@@ -112 +112 @@
         tc.find('CheckMerge')
         self.go_to_ticket(ticket_id)
-        tc.find('Rebranched from .* for .*')
+        tc.find('(Rebranched from .* for .*|There were conflicts on rebranching)')
         retval = call(['svn', 'ls', self.repo_url + '/' + component + '/branches/ticket-%s' % ticket_id],
                     stdout=logfile, stderr=logfile)