CVS の使い方
 使い方(場合分け)
 保管庫
  保管庫の指定方法
 改訂番号
  枝と葉
 import
 二回目

 枝の番号は奇数桁
 枝を作る三方法
 枝の確認方法
 実際例 (1) tag
 実際例 (2) rtag
 実際例 (3) import
 枝での変更を取込
 tag を消す
 枝の使い方
  過去形
  未来形
操作
 変更を元に戻す
 追っかけ
  -ko のこと
  import
  cvs co
  枝
  枝の持出
  枝を変更
  cvs add
  commit
  tag
  統合
CVSROOT
 history
  history の読み方
   一文字目
    時刻情報
Errors
 had a conflict and
 waiting for lock
関連道具
 cvstree
URL

software

CVS @ki.nu

Last Update: "2006/10/02 13:11:00 makoto"

Errors

had a conflict and

had a conflict and has not been modified
ttyp0:makoto@s900 12:32:15/061002(...gas/src)> cvs commit -m 'merge 2-17 branch' 
cvs commit: Examining .
cvs commit: file `config.sub' had a conflict and has not been modified
cvs commit: file `configure' had a conflict and has not been modified
...
cvs [commit aborted]: correct above errors first!
ttyp0:makoto@s900 12:40:04/061002(...gas/src)> 
<<<<<<< config.sub
timestamp='2006-04-22'
=======
timestamp='2006-01-02'
>>>>>>> 1.1.1.2
   247  12:43   cvs commit -m 'merge 2-17 branch' > & /tmp/conflict
   257  12:52   grep conflict /tmp/conflict | cut -d ' ' -f 4 | sed -e 's/`//' -e 's/.$//' ;
#!/usr/pkg/bin/perl
# $Header: /e/u/j/local-repository/htdocs/www/software/.cvs2/75000.errors.html.ja,v 1.1.1.1 2008/03/12 10:53:46 makoto Exp $
use strict;
my $before = 0;
my $after  = 0;

while (<>) {
    if    ( /^<<<<<<< / ) {
	$before++; 
	print STDERR;
	next;
    }
    elsif ( /^=======$/) {
	$before = 0; 
	$after  = 0;
	print STDERR;
	next;
    }
    elsif ( /^>>>>>>> /) {
	$after = 0;
	print STDERR;
	next;
    }
    
    if ($before) {next};
    print;
}

__END__
<<<<<<< config.sub
timestamp='2006-04-22'
=======
timestamp='2006-01-02'
>>>>>>> 1.1.1.2


Usage:

ttyp0:makoto@s900 13:03:08/061002(...gas/src)> grep conflict /tmp/conflict | cut -d ' ' -f 4 | sed -e 's/`//' -e 's/.$//' | awk '{print "mv", $1, $1 ".bak ; ~/perl/remove-conflict <",$1 ".bak >", $1}'
以前の cvs 情報
Last Update: Sat, 07 Jun 2014 13:16:17 GMT 1.66 2008/03/08