tests/test-git-import.t
changeset 14535 e597ef52a7c2
parent 14452 ee574cfd0c32
equal deleted inserted replaced
14534:ecc79816d31e 14535:e597ef52a7c2
   440   1 out of 1 hunks FAILED -- saving rejects to file b.rej
   440   1 out of 1 hunks FAILED -- saving rejects to file b.rej
   441   abort: patch failed to apply
   441   abort: patch failed to apply
   442   [255]
   442   [255]
   443   $ cat b
   443   $ cat b
   444   b
   444   b
       
   445 
       
   446   $ ln -s b linkb
       
   447   $ hg add linkb
       
   448   $ hg ci -m addlinkb
       
   449   $ hg import --no-commit - <<EOF
       
   450   > diff --git a/linkb b/linkb
       
   451   > deleted file mode 120000
       
   452   > --- a/linkb
       
   453   > +++ /dev/null
       
   454   > @@ -1,1 +0,0 @@
       
   455   > -badhunk
       
   456   > \ No newline at end of file
       
   457   > EOF
       
   458   applying patch from stdin
       
   459   patching file linkb
       
   460   Hunk #1 FAILED at 0
       
   461   1 out of 1 hunks FAILED -- saving rejects to file linkb.rej
       
   462   abort: patch failed to apply
       
   463   [255]
       
   464   $ hg st
       
   465   ? b.rej
       
   466   ? linkb.rej
       
   467 
   445   $ cd ..
   468   $ cd ..