sequencer: lib'ify do_recursive_merge()

diff --git a/git-p4.py b/git-p4.py
index 6b252df816752be640021fad95e1ed720987bf03..fd5ca524626c40823371422e52a3457fd1d45579 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1934,7 +1934,7 @@ def run(self, args):
         if self.useClientSpec:
             self.clientSpecDirs = getClientSpec()
 
-        # Check for the existance of P4 branches
+        # Check for the existence of P4 branches
         branchesDetected = (len(p4BranchesInGit().keys()) > 1)
 
         if self.useClientSpec and not branchesDetected:
@@ -2674,7 +2674,7 @@ def hasBranchPrefix(self, path):
             return True
         hasPrefix = [p for p in self.branchPrefixes
                         if p4PathStartsWith(path, p)]
-        if hasPrefix and self.verbose:
+        if not hasPrefix and self.verbose:
             print('Ignoring file outside of prefix: {0}'.format(path))
         return hasPrefix