Want more features on Pastebin? Sign Up, it's FREE!
Public Pastes
Guest

Untitled

By: a guest on Oct 13th, 2014  |  syntax: Diff  |  size: 1.71 KB  |  views: 181  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print  |  QR code  |  clone
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff --git a/tests/testlifter.py b/tests/testlifter.py
  2. index 1a72caf..5409611 100644
  3. --- a/tests/testlifter.py
  4. +++ b/tests/testlifter.py
  5. @@ -101,7 +101,7 @@ class RCSRepository:
  6.          "Convert the repo.  Leave the stream dump in a log file."
  7.          vopt = "-v " * (verbose - DEBUG_LIFTER + 1)
  8.          do_or_die("rm -fr {0} && mkdir {0} && git init --quiet {0}".format(gitdir))
  9. -        do_or_die('find {0} -name "*,v" | sort | cvs-fast-export {2} {3} | tee {1}.fi | (cd {1} >/dev/null; git fast-import --quiet --done && git checkout)'.format(self.directory, gitdir, vopt, more_opts))
  10. +        do_or_die('find {0} -name "*,v" | sort | ../cvs-fast-export {2} {3} | tee {1}.fi | (cd {1} >/dev/null; git fast-import --quiet --done && git checkout)'.format(self.directory, gitdir, vopt, more_opts))
  11.          self.conversions.append(gitdir)
  12.      def cleanup(self):
  13.          "Clean up the repository conversions."
  14. @@ -144,7 +144,7 @@ class CVSRepository:
  15.          "Convert a specified module.  Leave the stream dump in a log file."
  16.          vopt = "-v " * (verbose - DEBUG_LIFTER + 1)
  17.          do_or_die("rm -fr {0} && mkdir {0} && git init --quiet {0}".format(gitdir))
  18. -        do_or_die('find {0}/{1} -name "*,v" | sort | cvs-fast-export {3} {4} | tee {2}.fi | (cd {2} >/dev/null; git fast-import --quiet --done && git checkout)'.format(self.directory, module, gitdir, vopt, more_opts))
  19. +        do_or_die('find {0}/{1} -name "*,v" | sort | ../cvs-fast-export {3} {4} | tee {2}.fi | (cd {2} >/dev/null; git fast-import --quiet --done && git checkout)'.format(self.directory, module, gitdir, vopt, more_opts))
  20.          self.conversions.append(gitdir)
  21.      def cleanup(self):
  22.          "Clean up the repository checkout directories."
clone this paste RAW Paste Data
Top