##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

record: check that we are not committing a merge before patch selection...
record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.
Martin Geisler - - Load All Authors

File last commit:

r9711:d29bd00b default
r11237:feb2a58f stable
Show More
test-diff-color
64 lines | 724 B | text/plain | TextLexer
/ tests / test-diff-color
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "color=" >> $HGRCPATH
hg init repo
cd repo
cat > a <<EOF
c
c
a
a
b
a
a
c
c
EOF
hg ci -Am adda
cat > a <<EOF
c
c
a
a
dd
a
a
c
c
EOF
echo '% default context'
hg diff --nodates --color=always
echo '% --unified=2'
hg diff --nodates -U 2 --color=always
echo '% diffstat'
hg diff --stat --color=always
echo "record=" >> $HGRCPATH
echo "[ui]" >> $HGRCPATH
echo "interactive=true" >> $HGRCPATH
echo "[diff]" >> $HGRCPATH
echo "git=True" >> $HGRCPATH
echo % record
chmod 0755 a
hg record --color=always -m moda a <<EOF
y
y
EOF
echo
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
hg rollback
echo % qrecord
hg qrecord --color=always -m moda patch <<EOF
y
y
EOF
echo