Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-strict @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | 4e815ee377fd |
children |
rev | line source |
---|---|
2971
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 |
2978
4e815ee377fd
Make test-strict append to $HGRCPATH, like other tests do since 61fcd9fac434.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2971
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:
2971
diff
changeset
|
11 echo "strict=True" >> $HGRCPATH |
2971
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 |