@@ -1,19 +1,11 @@ module Grit - class RemoteError < StandardError - end - - class RemoteNonexistentError < StandardError - end - - class BranchNonexistentError < StandardError - end - - class RemoteBranchExistsError < StandardError - end - - class RemoteUninitializedError < StandardError - end + class RemoteError < StandardError; end + class RemoteNonexistentError < RemoteError; end + class BranchNonexistentError < RemoteError; end + class RemoteBranchExistsError < RemoteError; end + class RemoteUninitializedError < RemoteError; end + class ConflictError < RemoteError; end class Repo DAEMON_EXPORT_FILE = 'git-daemon-export-ok' @@ -547,6 +539,10 @@ module Grit raise BranchNonexistentError, last_error elsif last_error =~ /unknown revision or path not in the working tree/ raise RemoteUninitializedError, last_error + elsif last_error =~ /error: Entry '.*' would be overwritten by merge. Cannot merge./ + raise ConflictError, last_error + elsif last_error =~ /Entry '.*' not uptodate. Cannot merge./ + raise ConflictError, last_error elsif last_error =~ /(error|fatal)/ raise RemoteError, last_error end lib/grit/repo.rb 979e241b86895f9ce30f38939ec609f6775ecc16 Steve Hoeksema steve@seven.net.nz http://github.com/square-circle-triangle/grit/commit/5c5af60a0c98db6363074af5dc15a97d99b9c3d2 5c5af60a0c98db6363074af5dc15a97d99b9c3d2 2009-06-22T00:05:25-07:00 2009-06-22T00:05:25-07:00 raise error on conflicts b2f4392beae247976da23ebfc26203d6420de778 Steve Hoeksema steve@seven.net.nz