tests/test-import-unknown.t
changeset 14453 ea3d548132cc
child 16913 f2719b387380
equal deleted inserted replaced
14452:ee574cfd0c32 14453:ea3d548132cc
       
     1   $ cat <<EOF >> $HGRCPATH
       
     2   > [extensions]
       
     3   > purge =
       
     4   > EOF
       
     5 
       
     6   $ hg init test
       
     7   $ cd test
       
     8   $ echo a > changed
       
     9   $ echo a > removed
       
    10   $ echo a > source
       
    11   $ hg ci -Am addfiles
       
    12   adding changed
       
    13   adding removed
       
    14   adding source
       
    15   $ echo a >> changed
       
    16   $ echo a > added
       
    17   $ hg add added
       
    18   $ hg rm removed
       
    19   $ hg cp source copied
       
    20   $ hg diff --git > ../unknown.diff
       
    21 
       
    22 Test adding on top of an unknown file
       
    23 
       
    24   $ hg up -qC 0
       
    25   $ hg purge
       
    26   $ echo a > added
       
    27   $ hg import --no-commit ../unknown.diff
       
    28   applying ../unknown.diff
       
    29   file added already exists
       
    30   1 out of 1 hunks FAILED -- saving rejects to file added.rej
       
    31   abort: patch failed to apply
       
    32   [255]
       
    33 
       
    34 Test modifying an unknown file
       
    35 
       
    36   $ hg revert -aq
       
    37   $ hg purge
       
    38   $ hg rm changed
       
    39   $ hg ci -m removechanged
       
    40   $ echo a > changed
       
    41   $ hg import --no-commit ../unknown.diff
       
    42   applying ../unknown.diff
       
    43   abort: cannot patch changed: file is not tracked
       
    44   [255]
       
    45 
       
    46 Test removing an unknown file
       
    47 
       
    48   $ hg up -qC 0
       
    49   $ hg purge
       
    50   $ hg rm removed
       
    51   $ hg ci -m removeremoved
       
    52   created new head
       
    53   $ echo a > removed
       
    54   $ hg import --no-commit ../unknown.diff
       
    55   applying ../unknown.diff
       
    56   abort: cannot patch removed: file is not tracked
       
    57   [255]
       
    58 
       
    59 Test copying onto an unknown file
       
    60 
       
    61   $ hg up -qC 0
       
    62   $ hg purge
       
    63   $ echo a > copied
       
    64   $ hg import --no-commit ../unknown.diff
       
    65   applying ../unknown.diff
       
    66   abort: cannot create copied: destination already exists
       
    67   [255]