fix timezones in darcs-fast-export, take 2
[girocco-darcs-fast-export.git] / t / test2-git-incremental-specworkdir.sh
blob83731f23b255958428d5c6977d7bb62bb8195e18
1 . ./lib.sh
3 create_darcs test2 --darcs-2
5 rm -rf test2.darcs test2.git
6 mkdir test2.git
7 cd test2.git
8 git --bare init
9 mkdir darcs
10 cd ..
11 if [ "$1" != "--stdout" ]; then
12 dmark="$(pwd)/test2.git/darcs/test2.dfe-marks"
13 gmark="$(pwd)/test2.git/darcs/test2.gfi-marks"
14 rm -f $mark $gmark
15 darcs-fast-export --export-marks=$dmark test2 --working test2.git/darcs/repo |(cd test2.git; git fast-import --export-marks=$gmark)
16 diff_git test2 || die "initial conversion differs"
17 upd_file_darcs test2 file2 upd_contents
18 darcs-fast-export --export-marks=$dmark --import-marks=$dmark test2 --working test2.git/darcs/repo |(cd test2.git; git fast-import --export-marks=$gmark --import-marks=$gmark)
19 diff_git test2 || die "update differs"
20 else
21 darcs-fast-export test2