(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "git-cvsserver and git refspecs\n"> <LIT_CHARS "\n"> <LIT_CHARS "tests ability for git-cvsserver to switch between and compare\n"> <LIT_CHARS "tags, branches and other git refspecs">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]})
  (FunctionDef check_start_tree []
    (List
      (Com {[LIT_CHARS rm]} {[LIT_CHARS -f]} {[DQ [VarSub WORKDIR][LIT_CHARS /list.expected]]})
      (Com {[LIT_CHARS echo]} {[DQ [LIT_CHARS "start "][VarSub 1]]}
        <
        (FilenameRedirectNode filename={[DQ [VarSub WORKDIR][LIT_CHARS /check.log]]} <REDIR_DGREAT ">>"> 1),
        >
      )
    )
  )
  (FunctionDef check_file []
    (List
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('sandbox', {[DQ [VarSub 1]]})])
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('file', {[DQ [VarSub 2]]})])
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('ver', {[DQ [VarSub 3]]})])
      (Com {[LIT_CHARS git]} {[LIT_CHARS show]} {[DQ [VarSub ver][LIT_CHARS ":"][VarSub file]]}
        <
        (FilenameRedirectNode filename={[DQ [VarSub WORKDIR][LIT_CHARS /check.got]]} <REDIR_GREAT ">"> 1),
        (FilenameRedirectNode filename={[DQ [VarSub WORKDIR][LIT_CHARS /check.stderr]]} <REDIR_GREAT "2>"> 2),
        >

            more_env=[('GIT_DIR', {[VarSub SERVERDIR]})]
      )
      (Com {[LIT_CHARS test_cmp]} {[DQ [VarSub WORKDIR][LIT_CHARS /check.got]]} {[DQ [VarSub sandbox][LIT_CHARS /][VarSub file]]})
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('stat', {[VarSub ?]})])
      (Com {[LIT_CHARS echo]} {[DQ [LIT_CHARS "check_file "][VarSub sandbox][LIT_CHARS " "][VarSub file][LIT_CHARS " "][VarSub ver][LIT_CHARS " : "][VarSub stat]]}
        <
        (FilenameRedirectNode filename={[DQ [VarSub WORKDIR][LIT_CHARS /check.log]]} <REDIR_DGREAT ">>"> 1),
        >
      )
      (Com {[LIT_CHARS echo]} {[DQ [VarSub file]]}
        <
        (FilenameRedirectNode filename={[DQ [VarSub WORKDIR][LIT_CHARS /list.expected]]} <REDIR_DGREAT ">>"> 1),
        >
      )
      (Com {[LIT_CHARS return]} {[VarSub stat]})
    )
  )
  (FunctionDef check_end_tree []
    (AndOr OP_AND_IF
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('sandbox', {[DQ [VarSub 1]]})])
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS find]} {[DQ [VarSub sandbox]]} {[LIT_CHARS -name]} {[LIT_CHARS CVS]} {[LIT_CHARS -prune]} {[LIT_CHARS -o]} {[LIT_CHARS -type]} {[LIT_CHARS f]} {[LIT_CHARS -print]}
          <
          (FilenameRedirectNode filename={[DQ [VarSub WORKDIR][LIT_CHARS /list.actual]]} <REDIR_GREAT ">"> 1),
          >
        )
        (AndOr OP_AND_IF
          (Com {[LIT_CHARS sort]}
            <
            (FilenameRedirectNode filename={[DQ [VarSub WORKDIR][LIT_CHARS /list.expected]]} <REDIR_LESS "<"> 0),
            (FilenameRedirectNode filename={[LIT_CHARS expected]} <REDIR_GREAT ">"> 1),
            >
          )
          (AndOr OP_AND_IF
            (Pipeline
              (Com {[LIT_CHARS sort]}
                <
                (FilenameRedirectNode filename={[DQ [VarSub WORKDIR][LIT_CHARS /list.actual]]} <REDIR_LESS "<"> 0),
                >
              )
              (Com {[LIT_CHARS sed]} {[LIT_CHARS -e]} {[DQ [LIT_CHARS "s%cvswork/%%"]]}
                <
                (FilenameRedirectNode filename={[LIT_CHARS actual]} <REDIR_GREAT ">"> 1),
                >
              )
            )
            (AndOr OP_AND_IF
              (Com {[LIT_CHARS test_cmp]} {[LIT_CHARS expected]} {[LIT_CHARS actual]})
              (Com {[LIT_CHARS rm]} {[LIT_CHARS expected]} {[LIT_CHARS actual]})
            )
          )
        )
      )
    )
  )
  (FunctionDef check_end_full_tree []
    (AndOr OP_AND_IF
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('sandbox', {[DQ [VarSub 1]]})])
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS sort]}
          <
          (FilenameRedirectNode filename={[DQ [VarSub WORKDIR][LIT_CHARS /list.expected]]} <REDIR_LESS "<"> 0),
          (FilenameRedirectNode filename={[LIT_CHARS expected]} <REDIR_GREAT ">"> 1),
          >
        )
        (AndOr OP_AND_IF
          (Pipeline
            (Com {[LIT_CHARS find]} {[DQ [VarSub sandbox]]} {[LIT_CHARS -name]} {[LIT_CHARS CVS]} {[LIT_CHARS -prune]} {[LIT_CHARS -o]} {[LIT_CHARS -type]} {[LIT_CHARS f]} {[LIT_CHARS -print]})
            (Com {[LIT_CHARS sed]} {[LIT_CHARS -e]} {[DQ [LIT_CHARS "s%"][VarSub sandbox][LIT_CHARS "/%%"]]})
            (Com {[LIT_CHARS sort]}
              <
              (FilenameRedirectNode filename={[LIT_CHARS act1]} <REDIR_GREAT ">"> 1),
              >
            )
          )
          (AndOr OP_AND_IF
            (Com {[LIT_CHARS test_cmp]} {[LIT_CHARS expected]} {[LIT_CHARS act1]})
            (AndOr OP_AND_IF
              (Pipeline
                (Com {[LIT_CHARS git]} {[LIT_CHARS ls-tree]} {[LIT_CHARS --name-only]} {[LIT_CHARS -r]} {[DQ [VarSub 2]]})
                (Com {[LIT_CHARS sort]}
                  <
                  (FilenameRedirectNode filename={[LIT_CHARS act2]} <REDIR_GREAT ">"> 1),
                  >
                )
              )
              (AndOr OP_AND_IF
                (Com {[LIT_CHARS test_cmp]} {[LIT_CHARS expected]} {[LIT_CHARS act2]})
                (Com {[LIT_CHARS rm]} {[LIT_CHARS expected]} {[LIT_CHARS act1]} {[LIT_CHARS act2]})
              )
            )
          )
        )
      )
    )
  )
  (FunctionDef check_diff []
    (List
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('diffFile', {[DQ [VarSub 1]]})])
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('vOld', {[DQ [VarSub 2]]})])
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('vNew', {[DQ [VarSub 3]]})])
      (Com {[LIT_CHARS rm]} {[LIT_CHARS -rf]} {[LIT_CHARS diffSandbox]})
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS git]} {[LIT_CHARS clone]} {[LIT_CHARS -q]} {[LIT_CHARS -n]} {[LIT_CHARS .]} {[LIT_CHARS diffSandbox]})
        (Subshell
          (AndOr OP_AND_IF
            (Com {[LIT_CHARS cd]} {[LIT_CHARS diffSandbox]})
            (AndOr OP_AND_IF
              (Com {[LIT_CHARS git]} {[LIT_CHARS checkout]} {[DQ [VarSub vOld]]})
              (AndOr OP_AND_IF
                (Com {[LIT_CHARS git]} {[LIT_CHARS apply]} {[LIT_CHARS -p0]} {[LIT_CHARS --index]}
                  <
                  (FilenameRedirectNode filename={[DQ [LIT_CHARS ../][VarSub diffFile]]} <REDIR_LESS "<"> 0),
                  >
                )
                (Com {[LIT_CHARS git]} {[LIT_CHARS diff]} {[LIT_CHARS --exit-code]} {[DQ [VarSub vNew]]})
              )
            )
          )
        )
      )
    )
  )
  (Com {[LIT_CHARS cvs]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS /dev/null]} <REDIR_GREAT ">"> 1),
    (DescriptorRedirectNode target={[LIT_CHARS 1]} <REDIR_GREATAND "2>&"> 2),
    >
  )
  (If
    (Com {[LIT_CHARS test]} {[VarSub ?]} {[LIT_CHARS -ne]} {[LIT_CHARS 1]})
    (List
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('skip_all', {[SQ <LIT_CHARS "skipping git-cvsserver tests, cvs not found">]})])
      (Com {[LIT_CHARS test_done]})
    )
  )
  (If
    (Pipeline!
      (Com {[LIT_CHARS test_have_prereq]} {[LIT_CHARS PERL]})
    )
    (List
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('skip_all', {[SQ <LIT_CHARS "skipping git-cvsserver tests, perl not available">]})])
      (Com {[LIT_CHARS test_done]})
    )
  )
  (AndOr OP_OR_IF
    (Com {[LIT_CHARS perl]} {[LIT_CHARS -e]} {[SQ <LIT_CHARS "use DBI; use DBD::SQLite">]}
      <
      (FilenameRedirectNode filename={[LIT_CHARS /dev/null]} <REDIR_GREAT ">"> 1),
      (DescriptorRedirectNode target={[LIT_CHARS 1]} <REDIR_GREATAND "2>&"> 2),
      >
    )
    (List
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('skip_all', {[SQ <LIT_CHARS "skipping git-cvsserver tests, Perl SQLite interface unavailable">]})])
      (Com {[LIT_CHARS test_done]})
    )
  )
  (Com {[LIT_CHARS unset]} {[LIT_CHARS GIT_DIR]} {[LIT_CHARS GIT_CONFIG]})
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('WORKDIR', {[VarSub PWD]})])
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('SERVERDIR', {[VarSub PWD] [LIT_CHARS /gitcvs.git]})])
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('git_config', {[DQ [VarSub SERVERDIR][LIT_CHARS /config]]})])
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('CVSROOT', {[DQ [LIT_CHARS ":fork:"][VarSub SERVERDIR]]})])
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('CVSWORK', {[DQ [VarSub PWD][LIT_CHARS /cvswork]]})])
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('CVS_SERVER', {[LIT_CHARS git-cvsserver]})])
  (= scope=<EAssignScope.GLOBAL 1> flags=1 words=[{[LIT_CHARS CVSROOT]}, {[LIT_CHARS CVS_SERVER]}] bindings=[])
  (Com {[LIT_CHARS rm]} {[LIT_CHARS -rf]} {[DQ [VarSub CVSWORK]]} {[DQ [VarSub SERVERDIR]]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup v1, b1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo \"Simple text file\" >textfile.c &&\n"> <LIT_CHARS "\techo \"t2\" >t2 &&\n"> <LIT_CHARS "\tmkdir adir &&\n"> <LIT_CHARS "\techo \"adir/afile line1\" >adir/afile &&\n"> <LIT_CHARS "\techo \"adir/afile line2\" >>adir/afile &&\n"> <LIT_CHARS "\techo \"adir/afile line3\" >>adir/afile &&\n"> <LIT_CHARS "\techo \"adir/afile line4\" >>adir/afile &&\n"> <LIT_CHARS "\techo \"adir/a2file\" >>adir/a2file &&\n"> <LIT_CHARS "\tmkdir adir/bdir &&\n"> <LIT_CHARS "\techo \"adir/bdir/bfile line 1\" >adir/bdir/bfile &&\n"> <LIT_CHARS "\techo \"adir/bdir/bfile line 2\" >>adir/bdir/bfile &&\n"> <LIT_CHARS "\techo \"adir/bdir/b2file\" >adir/bdir/b2file &&\n"> <LIT_CHARS "\tgit add textfile.c t2 adir &&\n"> <LIT_CHARS "\tgit commit -q -m \"First Commit (v1)\" &&\n"> <LIT_CHARS "\tgit tag v1 &&\n"> <LIT_CHARS "\tgit branch b1 &&\n"> <LIT_CHARS "\tgit clone -q --bare \"$WORKDIR/.git\" \"$SERVERDIR\" >/dev/null 2>&1 &&\n"> <LIT_CHARS "\tGIT_DIR=\"$SERVERDIR\" git config --bool gitcvs.enabled true &&\n"> <LIT_CHARS "\tGIT_DIR=\"$SERVERDIR\" git config gitcvs.logfile \"$SERVERDIR/gitcvs.log\"\n">]})
  (Com {[LIT_CHARS rm]} {[LIT_CHARS -rf]} {[LIT_CHARS cvswork]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs co v1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tcvs -f -Q co -r v1 -d cvswork master >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork t2 v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a2file v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b2file v1 &&\n"> <LIT_CHARS "\tcheck_end_tree cvswork\n">]})
  (Com {[LIT_CHARS rm]} {[LIT_CHARS -rf]} {[LIT_CHARS cvswork]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs co b1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tcvs -f co -r b1 -d cvswork master >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork t2 v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a2file v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b2file v1 &&\n"> <LIT_CHARS "\tcheck_end_tree cvswork\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs co b1 [cvswork3]">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tcvs -f co -r b1 -d cvswork3 master >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork3 &&\n"> <LIT_CHARS "\tcheck_file cvswork3 textfile.c v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork3 t2 v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/afile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/a2file v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/bdir/bfile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/bdir/b2file v1 &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork3 v1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "edit cvswork3 and save diff">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd cvswork3 &&\n"> <LIT_CHARS "\t\tsed -e \"s/line1/line1 - data/\" adir/afile >adir/afileNEW &&\n"> <LIT_CHARS "\t\tmv -f adir/afileNEW adir/afile &&\n"> <LIT_CHARS "\t\techo \"afile5\" >adir/afile5 &&\n"> <LIT_CHARS "\t\trm t2 &&\n"> <LIT_CHARS "\t\tcvs -f add adir/afile5 &&\n"> <LIT_CHARS "\t\tcvs -f rm t2 &&\n"> <LIT_CHARS "\t\t! cvs -f diff -N -u >\"$WORKDIR/cvswork3edit.diff\"\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup v1.2 on b1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout b1 &&\n"> <LIT_CHARS "\techo \"new v1.2\" >t3 &&\n"> <LIT_CHARS "\trm t2 &&\n"> <LIT_CHARS "\tsed -e \"s/line3/line3 - more data/\" adir/afile >adir/afileNEW &&\n"> <LIT_CHARS "\tmv -f adir/afileNEW adir/afile &&\n"> <LIT_CHARS "\trm adir/a2file &&\n"> <LIT_CHARS "\techo \"a3file\" >>adir/a3file &&\n"> <LIT_CHARS "\techo \"bfile line 3\" >>adir/bdir/bfile &&\n"> <LIT_CHARS "\trm adir/bdir/b2file &&\n"> <LIT_CHARS "\techo \"b3file\" >adir/bdir/b3file &&\n"> <LIT_CHARS "\tmkdir cdir &&\n"> <LIT_CHARS "\techo \"cdir/cfile\" >cdir/cfile &&\n"> <LIT_CHARS "\tgit add -A cdir adir t3 t2 &&\n"> <LIT_CHARS "\tgit commit -q -m ">] [LIT_CHARS v1.2] [SQ <LIT_CHARS " &&\n"> <LIT_CHARS "\tgit tag v1.2 &&\n"> <LIT_CHARS "\tgit push --tags gitcvs.git b1:b1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs -f up (on b1 adir)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork/adir && cvs -f up -d ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork t2 v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a3file v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b3file v1.2 &&\n"> <LIT_CHARS "\tcheck_end_tree cvswork\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up (on b1 /)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork t3 v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a3file v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b3file v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork cdir/cfile v1.2 &&\n"> <LIT_CHARS "\tcheck_end_tree cvswork\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up (on b1 /) (again; check CVS/Tag files)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork t3 v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a3file v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b3file v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork cdir/cfile v1.2 &&\n"> <LIT_CHARS "\tcheck_end_tree cvswork\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up -r v1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up -r v1 ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork t2 v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a2file v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b2file v1 &&\n"> <LIT_CHARS "\tcheck_end_tree cvswork\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork t2 v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a2file v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b2file v1 &&\n"> <LIT_CHARS "\tcheck_end_tree cvswork\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up (again; check CVS/Tag files)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork t2 v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a2file v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b2file v1 &&\n"> <LIT_CHARS "\tcheck_end_tree cvswork\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup simple b2">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit branch b2 v1 &&\n"> <LIT_CHARS "\tgit push --tags gitcvs.git b2:b2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs co b2 [into cvswork2]">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tcvs -f co -r b2 -d cvswork2 master >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork t2 v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a2file v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b2file v1 &&\n"> <LIT_CHARS "\tcheck_end_tree cvswork\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "root dir edit [cvswork2]">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd cvswork2 && echo \"Line 2\" >>textfile.c &&\n"> <LIT_CHARS "\t\t! cvs -f diff -u >\"$WORKDIR/cvsEdit1.diff\" &&\n"> <LIT_CHARS "\t\tcvs -f commit -m \"edit textfile.c\" textfile.c\n"> <LIT_CHARS "\t) >cvsEdit1.log 2>&1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "root dir rm file [cvswork2]">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd cvswork2 &&\n"> <LIT_CHARS "\t\tcvs -f rm -f t2 &&\n"> <LIT_CHARS "\t\tcvs -f diff -u >../cvsEdit2-empty.diff &&\n"> <LIT_CHARS "\t\t! cvs -f diff -N -u >\"$WORKDIR/cvsEdit2-N.diff\" &&\n"> <LIT_CHARS "\t\tcvs -f commit -m \"rm t2\"\n"> <LIT_CHARS "\t) >cvsEdit2.log 2>&1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "subdir edit/add/rm files [cvswork2]">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd cvswork2 &&\n"> <LIT_CHARS "\t\tsed -e \"s/line 1/line 1 (v2)/\" adir/bdir/bfile >adir/bdir/bfileNEW &&\n"> <LIT_CHARS "\t\tmv -f adir/bdir/bfileNEW adir/bdir/bfile &&\n"> <LIT_CHARS "\t\trm adir/bdir/b2file &&\n"> <LIT_CHARS "\t\tcd adir &&\n"> <LIT_CHARS "\t\tcvs -f rm bdir/b2file &&\n"> <LIT_CHARS "\t\techo \"4th file\" >bdir/b4file &&\n"> <LIT_CHARS "\t\tcvs -f add bdir/b4file &&\n"> <LIT_CHARS "\t\t! cvs -f diff -N -u >\"$WORKDIR/cvsEdit3.diff\" &&\n"> <LIT_CHARS "\t\tgit fetch gitcvs.git b2:b2 &&\n"> <LIT_CHARS "\t\t(\n"> <LIT_CHARS "\t\t  cd .. &&\n"> <LIT_CHARS "\t\t  ! cvs -f diff -u -N -r v1.2 >\"$WORKDIR/cvsEdit3-v1.2.diff\" &&\n"> <LIT_CHARS "\t\t  ! cvs -f diff -u -N -r v1.2 -r v1 >\"$WORKDIR/cvsEdit3-v1.2-v1.diff\"\n"> <LIT_CHARS "\t\t) &&\n"> <LIT_CHARS "\t\tcvs -f commit -m \"various add/rm/edit\"\n"> <LIT_CHARS "\t) >cvs.log 2>&1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "validate result of edits [cvswork2]">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit fetch gitcvs.git b2:b2 &&\n"> <LIT_CHARS "\tgit tag v2 b2 &&\n"> <LIT_CHARS "\tgit push --tags gitcvs.git b2:b2 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork2 &&\n"> <LIT_CHARS "\tcheck_file cvswork2 textfile.c v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork2 adir/afile v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork2 adir/a2file v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork2 adir/bdir/bfile v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork2 adir/bdir/b4file v2 &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork2 v2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "validate basic diffs saved during above cvswork2 edits">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(grep Index: cvsEdit1.diff | wc -l) = 1 &&\n"> <LIT_CHARS "\ttest_must_be_empty cvsEdit2-empty.diff &&\n"> <LIT_CHARS "\ttest $(grep Index: cvsEdit2-N.diff | wc -l) = 1 &&\n"> <LIT_CHARS "\ttest $(grep Index: cvsEdit3.diff | wc -l) = 3 &&\n"> <LIT_CHARS "\trm -rf diffSandbox &&\n"> <LIT_CHARS "\tgit clone -q -n . diffSandbox &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd diffSandbox &&\n"> <LIT_CHARS "\t\tgit checkout v1 &&\n"> <LIT_CHARS "\t\tgit apply -p0 --index <\"$WORKDIR/cvsEdit1.diff\" &&\n"> <LIT_CHARS "\t\tgit apply -p0 --index <\"$WORKDIR/cvsEdit2-N.diff\" &&\n"> <LIT_CHARS "\t\tgit apply -p0 --directory=adir --index <\"$WORKDIR/cvsEdit3.diff\" &&\n"> <LIT_CHARS "\t\tgit diff --exit-code v2\n"> <LIT_CHARS "\t) >\"check_diff_apply.out\" 2>&1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "validate v1.2 diff saved during last cvswork2 edit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(grep Index: cvsEdit3-v1.2.diff | wc -l) = 9 &&\n"> <LIT_CHARS "\tcheck_diff cvsEdit3-v1.2.diff v1.2 v2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "validate v1.2 v1 diff saved during last cvswork2 edit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(grep Index: cvsEdit3-v1.2-v1.diff | wc -l) = 9 &&\n"> <LIT_CHARS "\tcheck_diff cvsEdit3-v1.2-v1.diff v1.2 v1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up [cvswork2]">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork2 && cvs -f up ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork2 &&\n"> <LIT_CHARS "\tcheck_file cvswork2 textfile.c v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork2 adir/afile v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork2 adir/a2file v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork2 adir/bdir/bfile v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork2 adir/bdir/b4file v2 &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork2 v2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up -r b2 [back to cvswork]">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up -r b2 ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a2file v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b4file v2 &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork v2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up -r b1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up -r b1 ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork t3 v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a3file v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b3file v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork cdir/cfile v1.2 &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork v1.2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up -A">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up -A ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork t2 v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a2file v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b2file v1 &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork v1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up (check CVS/Tag files)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork t2 v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a2file v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b2file v1 &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork v1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up -r heads/b1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up -r heads/b1 ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork t3 v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a3file v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b3file v1.2 &&\n"> <LIT_CHARS "\tcheck_file cvswork cdir/cfile v1.2 &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork v1.2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up -r heads_-s-b2 (cvsserver escape mechanism)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up -r heads_-s-b2 ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a2file v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v2 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b4file v2 &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork v2\n">]})
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('v1hash', {[ComSub (Com {[LIT_CHARS git]} {[LIT_CHARS rev-parse]} {[LIT_CHARS v1]})]})])
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up -r $(git rev-parse v1)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest -n \"$v1hash\" &&\n"> <LIT_CHARS "\t( cd cvswork && cvs -f up -r \"$v1hash\" ) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork &&\n"> <LIT_CHARS "\tcheck_file cvswork textfile.c v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork t2 v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/afile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/a2file v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/bfile v1 &&\n"> <LIT_CHARS "\tcheck_file cvswork adir/bdir/b2file v1 &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork v1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs diff -r v1 -u">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && cvs -f diff -r v1 -u ) >cvsDiff.out 2>cvs.log &&\n"> <LIT_CHARS "\ttest_must_be_empty cvsDiff.out &&\n"> <LIT_CHARS "\ttest_must_be_empty cvs.log\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs diff -N -r v2 -u">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && ! cvs -f diff -N -r v2 -u ) >cvsDiff.out 2>cvs.log &&\n"> <LIT_CHARS "\ttest_must_be_empty cvs.log &&\n"> <LIT_CHARS "\ttest -s cvsDiff.out &&\n"> <LIT_CHARS "\tcheck_diff cvsDiff.out v2 v1 >check_diff.out 2>&1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs diff -N -r v2 -r v1.2">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork && ! cvs -f diff -N -r v2 -r v1.2 -u ) >cvsDiff.out 2>cvs.log &&\n"> <LIT_CHARS "\ttest_must_be_empty cvs.log &&\n"> <LIT_CHARS "\ttest -s cvsDiff.out &&\n"> <LIT_CHARS "\tcheck_diff cvsDiff.out v2 v1.2 >check_diff.out 2>&1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "apply early [cvswork3] diff to b3">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit clone -q . gitwork3 &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd gitwork3 &&\n"> <LIT_CHARS "\t\tgit checkout -b b3 v1 &&\n"> <LIT_CHARS "\t\tgit apply -p0 --index <\"$WORKDIR/cvswork3edit.diff\" &&\n"> <LIT_CHARS "\t\tgit commit -m \"cvswork3 edits applied\"\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\tgit fetch gitwork3 b3:b3 &&\n"> <LIT_CHARS "\tgit tag v3 b3\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "check [cvswork3] diff">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd cvswork3 && ! cvs -f diff -N -u ) >\"$WORKDIR/cvsDiff.out\" 2>cvs.log &&\n"> <LIT_CHARS "\ttest_must_be_empty cvs.log &&\n"> <LIT_CHARS "\ttest -s cvsDiff.out &&\n"> <LIT_CHARS "\ttest $(grep Index: cvsDiff.out | wc -l) = 3 &&\n"> <LIT_CHARS "\ttest_cmp cvsDiff.out cvswork3edit.diff &&\n"> <LIT_CHARS "\tcheck_diff cvsDiff.out v1 v3 >check_diff.out 2>&1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge early [cvswork3] b3 with b1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t( cd gitwork3 && git merge -m \"message\" b1 ) &&\n"> <LIT_CHARS "\tgit fetch gitwork3 b3:b3 &&\n"> <LIT_CHARS "\tgit tag v3merged b3 &&\n"> <LIT_CHARS "\tgit push --tags gitcvs.git b3:b3\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs up dirty [cvswork3]">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd cvswork3 &&\n"> <LIT_CHARS "\t\tcvs -f up &&\n"> <LIT_CHARS "\t\t! cvs -f diff -N -u >\"$WORKDIR/cvsDiff.out\"\n"> <LIT_CHARS "\t) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\ttest -s cvsDiff.out &&\n"> <LIT_CHARS "\ttest $(grep Index: cvsDiff.out | wc -l) = 2 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork3 &&\n"> <LIT_CHARS "\tcheck_file cvswork3 textfile.c v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 t3 v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/afile v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/a3file v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/afile5 v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/bdir/bfile v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/bdir/b3file v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 cdir/cfile v3merged &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork3 v3merged\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cvs commit [cvswork3]">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd cvswork3 &&\n"> <LIT_CHARS "\t\tcvs -f commit -m \"dirty sandbox after auto-merge\"\n"> <LIT_CHARS "\t) >cvs.log 2>&1 &&\n"> <LIT_CHARS "\tcheck_start_tree cvswork3 &&\n"> <LIT_CHARS "\tcheck_file cvswork3 textfile.c v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 t3 v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/afile v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/a3file v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/afile5 v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/bdir/bfile v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 adir/bdir/b3file v3merged &&\n"> <LIT_CHARS "\tcheck_file cvswork3 cdir/cfile v3merged &&\n"> <LIT_CHARS "\tcheck_end_full_tree cvswork3 v3merged &&\n"> <LIT_CHARS "\tgit fetch gitcvs.git b3:b4 &&\n"> <LIT_CHARS "\tgit tag v4.1 b4 &&\n"> <LIT_CHARS "\tgit diff --exit-code v4.1 v3merged >check_diff_apply.out 2>&1\n">]})
  (Com {[LIT_CHARS test_done]})
)