Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-strict
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 06 Jun 2007 19:05:18 +0200
changeset 4510 e0bc2c575044
parent 2978 4e815ee377fd
permissions -rwxr-xr-x
Issue a warning if "-r ." is used with two working directory parents. Rationale for not aborting instead: The first parent is usually more important as it is the local branch during a merge and commands like 'hg diff' and 'hg diff -r.' behave still identically (except for the warning of course). Added a test for log -r. with one and two parents.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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















mercurial-crew-with-dirclash