Mercurial > hg
annotate tests/test-paths @ 6933:17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Make merge and resolve trigger kwtemplater.restricted to compare
data without keyword expansion.
The keyword stays outside the conflict:
$Keyword$
<<<<<<< local
bar
=======
foo
>>>>>>> other
and will again be expanded on commit.
Demonstrate in test case.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Fri, 22 Aug 2008 08:26:18 +0200 |
parents | 92eb0a019bf2 |
children |
rev | line source |
---|---|
5943
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff
changeset
|
1 #!/bin/sh |
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff
changeset
|
2 hg init a |
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff
changeset
|
3 hg clone a b |
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff
changeset
|
4 cd a |
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff
changeset
|
5 echo '[paths]' >> .hg/hgrc |
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff
changeset
|
6 echo 'dupe = ../b' >> .hg/hgrc |
5951 | 7 hg in dupe | fgrep '../' |
5943
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff
changeset
|
8 cd .. |
5951 | 9 hg -R a in dupe | fgrep '../' |
5943
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
diff
changeset
|
10 true |