tests/test-import-git.t
branchstable
changeset 16506 fc4e0fecf403
parent 16112 d7829b2ecf32
child 16522 a8065323c003
equal deleted inserted replaced
16505:db85c24dcdea 16506:fc4e0fecf403
   481   [255]
   481   [255]
   482   $ hg st
   482   $ hg st
   483   ? b.rej
   483   ? b.rej
   484   ? linkb.rej
   484   ? linkb.rej
   485 
   485 
       
   486 Test corner case involving copies and multiple hunks (issue3384)
       
   487 
       
   488   $ hg revert -qa
       
   489   $ hg import --no-commit - <<EOF
       
   490   > diff --git a/a b/c
       
   491   > copy from a
       
   492   > copy to c
       
   493   > --- a/a
       
   494   > +++ b/c
       
   495   > @@ -1,1 +1,2 @@
       
   496   >  a
       
   497   > +a
       
   498   > @@ -2,1 +2,2 @@
       
   499   >  a
       
   500   > +a
       
   501   > diff --git a/a b/a
       
   502   > --- a/a
       
   503   > +++ b/a
       
   504   > @@ -1,1 +1,2 @@
       
   505   >  a
       
   506   > +b
       
   507   > EOF
       
   508   applying patch from stdin
       
   509 
   486   $ cd ..
   510   $ cd ..