diff --git a/ChangeLog b/ChangeLog index 97ce4364716328..e907d63f9ca5a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Feb 8 09:49:58 2012 NARUSE, Yui + + * tool/merger.rb: don't abort, update first. + Wed Feb 08 09:57:33 2012 Martin Bosslet * ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString. diff --git a/tool/merger.rb b/tool/merger.rb index 673f7b1876f87d..d8ae16016b1e30 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -125,10 +125,7 @@ def default_merge_branch help exit else - unless `svn st`.empty? - puts 'this working directory is not clean' - abort - end + system 'svn up' q = $repos + (ARGV[1] || default_merge_branch) revs = ARGV[0].split /,\s*/ @@ -204,7 +201,6 @@ def default_merge_branch if system *%w'svn ci -F' + [f.path] # tag :interactive # no longer needed. - system 'svn up' system 'rm -f subversion.commitlog' else puts 'commit failed; try again.'