Mercurial > hg
annotate tests/test-strict @ 4682:dc5920ea12f8
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 22 Jun 2007 20:44:40 -0300 |
parents | 4e815ee377fd |
children | 6c82beaaa11a |
rev | line source |
---|---|
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 #!/bin/sh |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 hg init |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 echo a > a |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 hg ci -d '0 0' -Ama |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 hg an a |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 |
2992
4e815ee377fd
Make test-strict append to $HGRCPATH, like other tests do since 61fcd9fac434.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2988
diff
changeset
|
10 echo "[ui]" >> $HGRCPATH |
4e815ee377fd
Make test-strict append to $HGRCPATH, like other tests do since 61fcd9fac434.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2988
diff
changeset
|
11 echo "strict=True" >> $HGRCPATH |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 hg an a |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 hg annotate a |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 echo % should succeed - up is an alias, not an abbreviation |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 |
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 hg up |