@@ -74,10 +74,10 @@ Main { . braid update local/dir TXT - mixin :optional_path, :option_revision, :option_head, :option_break + mixin :optional_path, :option_revision, :option_head, :option_safe run { - Braid::Command.run(:update, path, { "revision" => revision, "head" => head , "break" => break? }) + Braid::Command.run(:update, path, { "revision" => revision, "head" => head , "safe" => safe }) } } @@ -211,10 +211,10 @@ Main { } } - mixin(:option_break) { - option(:break) { + mixin(:option_safe) { + option(:safe) { optional - desc 'break on merge errors' + desc 'safe on merge errors' attr } } bin/braid @@ -53,7 +53,7 @@ module Braid git.rm_r(mirror.path) git.read_tree(target_hash, mirror.path) unless diff.empty? - git.apply(diff, *(options["break"] ? ["--reject"] : [])) + git.apply(diff, *(options["safe"] ? ["--reject"] : [])) end else git.merge_subtree(target_hash) @@ -66,7 +66,7 @@ module Braid git.commit(commit_message) rescue Operations::ShellExecutionError => error - if options["break"] + if options["safe"] msg "Caught shell error. Breaking." exit(0) else lib/braid/commands/update.rb 249f33f463b9287036c1a64fb5c0e567d06eb231 Cristi Balan evil@che.lu http://github.com/evilchelu/braid/commit/b3a763f8a54cd2da7924ca969668d311901927c5 b3a763f8a54cd2da7924ca969668d311901927c5 2008-08-19T13:27:35-07:00 2008-08-19T13:27:35-07:00 rename break to safe as it's crashing in tests 0218804c4ddffc676f11b64c422045d9acd940f2 Cristi Balan evil@che.lu