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-addremove-similar
author Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045 f191bc3916f7
parent 4966 8d982aef0be1
permissions -rwxr-xr-x
merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4135
6cb6cfe43c5d Avoid some false positives for addremove -s
Erling Ellingsen <erlingalf@gmail.com>
parents:
diff changeset 
     1
 
#!/bin/sh
6cb6cfe43c5d Avoid some false positives for addremove -s
Erling Ellingsen <erlingalf@gmail.com>
parents:
diff changeset 
     2
 












6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




     3


hg init rep; cd rep













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




     4














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




     5


touch empty-file













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




     6


python -c 'for x in range(10000): print x' > large-file













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




     7














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




     8


hg addremove













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




     9














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    10


hg commit -m A













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    11














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    12


rm large-file empty-file













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    13


python -c 'for x in range(10,10000): print x' > another-file













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    14














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    15


hg addremove -s50













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    16














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    17


hg commit -m B













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    18









4471






736e49292809
addremove: comparing two empty files caused ZeroDivisionError



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
4135

diff
changeset




    19


echo % comparing two empty files caused ZeroDivisionError in the past













736e49292809
addremove: comparing two empty files caused ZeroDivisionError



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
4135

diff
changeset




    20


hg update -C 0













736e49292809
addremove: comparing two empty files caused ZeroDivisionError



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
4135

diff
changeset




    21


rm empty-file













736e49292809
addremove: comparing two empty files caused ZeroDivisionError



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
4135

diff
changeset




    22


touch another-empty-file













736e49292809
addremove: comparing two empty files caused ZeroDivisionError



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
4135

diff
changeset




    23


hg addremove -s50













736e49292809
addremove: comparing two empty files caused ZeroDivisionError



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
4135

diff
changeset




    24









4135






6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    25


cd ..













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    26














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    27


hg init rep2; cd rep2













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    28














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    29


python -c 'for x in range(10000): print x' > large-file













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    30


python -c 'for x in range(50): print x' > tiny-file













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    31














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    32


hg addremove













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    33














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    34


hg commit -m A













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    35














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    36


python -c 'for x in range(70): print x' > small-file













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    37


rm tiny-file













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    38


rm large-file













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    39














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    40


hg addremove -s50













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    41














6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    42


hg commit -m B













6cb6cfe43c5d
Avoid some false positives for addremove -s



Erling Ellingsen <erlingalf@gmail.com>


parents: 

diff
changeset




    43









4966






8d982aef0be1
addremove: print meaningful error message if --similar not numeric



Bryan O'Sullivan <bos@serpentine.com>


parents: 
4471

diff
changeset




    44


echo % should all fail













8d982aef0be1
addremove: print meaningful error message if --similar not numeric



Bryan O'Sullivan <bos@serpentine.com>


parents: 
4471

diff
changeset




    45


hg addremove -s foo













8d982aef0be1
addremove: print meaningful error message if --similar not numeric



Bryan O'Sullivan <bos@serpentine.com>


parents: 
4471

diff
changeset




    46


hg addremove -s -1













8d982aef0be1
addremove: print meaningful error message if --similar not numeric



Bryan O'Sullivan <bos@serpentine.com>


parents: 
4471

diff
changeset




    47


hg addremove -s 1e6













8d982aef0be1
addremove: print meaningful error message if --similar not numeric



Bryan O'Sullivan <bos@serpentine.com>


parents: 
4471

diff
changeset




    48














8d982aef0be1
addremove: print meaningful error message if --similar not numeric



Bryan O'Sullivan <bos@serpentine.com>


parents: 
4471

diff
changeset




    49


true















mercurial-crew-with-dirclash