Mercurial > hg
comparison tests/test-extdiff @ 7758:e81e6c996e99
extdiff: add --change option to display single changeset diff
This is the counterpart for extdiff of 9c6ae2e09e11.
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 07 Feb 2009 19:41:05 +0100 |
parents | d4fa6bafc43a |
children | 66d0a03d3afc |
comparison
equal
deleted
inserted
replaced
7757:af6a63438a8a | 7758:e81e6c996e99 |
---|---|
30 # test diff during merge | 30 # test diff during merge |
31 hg update 0 | 31 hg update 0 |
32 echo c >> c | 32 echo c >> c |
33 hg add c | 33 hg add c |
34 hg ci -m "new branch" -d '1 0' | 34 hg ci -m "new branch" -d '1 0' |
35 hg update -C 1 | 35 hg merge 1 |
36 hg merge tip | |
37 # should diff cloned file against wc file | 36 # should diff cloned file against wc file |
38 hg falabala > out || echo "diff-like tools yield a non-zero exit code" | 37 hg falabala > out |
39 # cleanup the output since the wc is a tmp directory | 38 # cleanup the output since the wc is a tmp directory |
40 sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out | 39 sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out |
40 # test --change option | |
41 hg ci -d '2 0' -mtest3 | |
42 hg falabala -c 1 | |
43 # check diff are made from the first parent | |
44 hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" | |
45 #hg log |