Mercurial Mercurial > hg / 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 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 2992 4e815ee377fd
child 8167 6c82beaaa11a
permissions -rwxr-xr-x
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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















Mercurial