Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-hgrc @ 1798:d610fe0e6893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Thu, 23 Feb 2006 18:10:04 +0100
parents 7d66ce9895fa
children 7a7d4937272b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1473
7d66ce9895fa make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
1 #!/bin/sh
7d66ce9895fa make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
2
7d66ce9895fa make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
3 mkdir t
7d66ce9895fa make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
4 cd t
7d66ce9895fa make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
5 hg init
7d66ce9895fa make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
6 echo "invalid" > .hg/hgrc
7d66ce9895fa make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
7 hg status 2>&1 |sed -e "s:/.*\(/t/.*\):...\1:"