Show More
@@ -54,13 +54,14 echo '% diff in working directory, befor | |||||
54 | hg diff --git |
|
54 | hg diff --git | |
55 | echo '% edit with extdiff -p' |
|
55 | echo '% edit with extdiff -p' | |
56 | # prepare custom diff/edit tool |
|
56 | # prepare custom diff/edit tool | |
57 |
cat > differ. |
|
57 | cat > differ.py << EOT | |
58 | #!/bin/sh |
|
58 | #!/usr/bin/env python | |
59 | sleep 1 # avoid unchanged-timestamp problems |
|
59 | import time | |
60 | echo edited >> a/a |
|
60 | time.sleep(1) # avoid unchanged-timestamp problems | |
61 | echo edited >> a/b |
|
61 | file('a/a', 'ab').write('edited\n') | |
|
62 | file('a/b', 'ab').write('edited\n') | |||
62 | EOT |
|
63 | EOT | |
63 |
chmod +x differ. |
|
64 | chmod +x differ.py | |
64 |
hg extdiff -p `pwd`/differ. |
|
65 | hg extdiff -p `pwd`/differ.py # will change to /tmp/extdiff.TMP and populate directories a.TMP and a and start tool | |
65 | echo '% diff in working directory, after' |
|
66 | echo '% diff in working directory, after' | |
66 | hg diff --git |
|
67 | hg diff --git |
General Comments 0
You need to be logged in to leave comments.
Login now