Changeset 14522 for docs

Show
Ignore:
Timestamp:
06/24/08 15:13:25 (5 years ago)
Author:
shyouhei
Message:

a fancy output

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • docs/shyouhei/ruby development/merger.rb

    r14241 r14522  
    8585system *%w'svn resolved version.h' 
    8686 
    87 STDERR.puts log_svn 
    8887f = Tempfile.new 'merger.rb' 
    8988f.printf "merge revision(s) %s:\n", ARGV[0] 
    … …  
    9493 
    9594loop do 
    96   system '(svn stat; echo; svn diff) | lv' # explicitly invoke shell 
     95  r, w = IO.pipe 
     96  fork do 
     97    w.close 
     98    STDIN.reopen r 
     99    exec 'lv' 
     100  end 
     101  r.close 
     102  w << f.read 
     103  w << "\n\n" 
     104  w << `svn stat` 
     105  w << `svn diff` 
     106  w.close 
     107  Process.waitall 
    97108  STDERR.puts 'conflicts resolved? (y:yes, a:abort, r:retry, otherwise abort)' 
    98109  case STDIN.gets