diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-26 21:02:23 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-26 21:02:23 +0000 |
commit | d6a9303f92a85fe64793b23cac5cf1cbaa15bc13 (patch) | |
tree | c1b19ea2f1edf5d282f5b33b90a3ee7e1ace5a77 | |
parent | 68149193a973518a44c4909a03b5073b75d07d67 (diff) | |
download | ruby-d6a9303f92a85fe64793b23cac5cf1cbaa15bc13.tar.gz |
vcs.rb: refresh after dcommit
* tool/vcs.rb (VCS::GIT#commit): refresh until sync after dcommit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | tool/vcs.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tool/vcs.rb b/tool/vcs.rb index ec75840746..6925660f20 100644 --- a/tool/vcs.rb +++ b/tool/vcs.rb @@ -465,7 +465,13 @@ class VCS rev = cmd_read(%W"#{COMMAND} svn info"+[STDERR=>[:child, :out]])[/^Last Changed Rev: (\d+)/, 1] ret = system(COMMAND, "svn", "dcommit") if ret and rev - cmd_read(%W"#{COMMAND} svn reset -r#{rev}") + old = [cmd_read(%W"#{COMMAND} log -1 --format=%H").chomp] + old << cmd_read(%W"#{COMMAND} svn reset -r#{rev}")[/^r#{rev} = (\h+)/, 1] + 3.times do + sleep 2 + system(*%W"#{COMMAND} pull --no-edit --rebase") + break unless old.include?(cmd_read(%W"#{COMMAND} log -1 --format=%H").chomp) + end end ret end |