diff options
Diffstat (limited to 'tool/vcs.rb')
-rw-r--r-- | tool/vcs.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tool/vcs.rb b/tool/vcs.rb index e710448ec1..7e06f3dbcc 100644 --- a/tool/vcs.rb +++ b/tool/vcs.rb @@ -487,6 +487,7 @@ class VCS def commit rev = cmd_read(%W"#{COMMAND} svn info"+[STDERR=>[:child, :out]])[/^Last Changed Rev: (\d+)/, 1] com = cmd_read(%W"#{COMMAND} svn find-rev r#{rev}").chomp + head = cmd_read(%W"#{COMMAND} symbolic-ref --short HEAD").chomp commits = cmd_read([COMMAND, "log", "--reverse", "--format=%H %ae %ce", "#{com}..@"], "rb").split("\n") commits.each_with_index do |l, i| @@ -496,6 +497,7 @@ class VCS dcommit << "--add-author-from" unless a == c dcommit << r system(*dcommit) or return false + system(COMMAND, "checkout", head) or return false system(COMMAND, "rebase") or return false end |