Version control system wrapper allowing the developer to worry about only having to learn one command set to manage all types of repositories.

merge.py 496B

12345678910111213141516171819202122
  1. from utilities import execute, isGit, isMercurial, isBazaar
  2. def merge(arguments):
  3. '''
  4. Merge incoming changes with the current branch.
  5. '''
  6. if isGit():
  7. command = ["git", "merge"]
  8. command.extend(arguments)
  9. execute(command)
  10. if isMercurial():
  11. command = ["hg", "merge"]
  12. command.extend(arguments)
  13. execute(command)
  14. if isBazaar():
  15. command = ["bzr", "merge"]
  16. command.extend(arguments)
  17. execute(command)