tests/test-convert-cvs-detectmerge.t
branchstable
changeset 14824 7698c275aa56
parent 14569 017ab404e588
child 18376 13d73bf6be29
equal deleted inserted replaced
14822:760d2dae4839 14824:7698c275aa56
    52   T file1
    52   T file1
    53 
    53 
    54 modify file1 on branch v1_0
    54 modify file1 on branch v1_0
    55 
    55 
    56   $ cvscall -Q update -rv1_0
    56   $ cvscall -Q update -rv1_0
       
    57   $ sleep 1
    57   $ echo "change" >> file1
    58   $ echo "change" >> file1
    58   $ cvsci -m"add text"
    59   $ cvsci -m"add text"
    59   cvs commit: Examining .
    60   cvs commit: Examining .
    60 
    61 
    61 make unrelated change on v1_1
    62 make unrelated change on v1_1