tests/test-transplant.t
changeset 14015 39920ce75842
parent 14013 bcff4759d17d
child 14223 e456084a3ecc
equal deleted inserted replaced
14011:b69471bdb678 14015:39920ce75842
   395   $ hg init twin2
   395   $ hg init twin2
   396   $ cd twin2
   396   $ cd twin2
   397   $ echo '[patch]' >> .hg/hgrc
   397   $ echo '[patch]' >> .hg/hgrc
   398   $ echo 'eol = crlf' >> .hg/hgrc
   398   $ echo 'eol = crlf' >> .hg/hgrc
   399   $ python -c "file('b', 'wb').write('b\r\nb\r\n')"
   399   $ python -c "file('b', 'wb').write('b\r\nb\r\n')"
   400   $ hg ci -m addb
   400   $ hg ci -Am addb
   401   nothing changed
   401   adding b
   402   [1]
       
   403   $ hg transplant -s ../twin1 tip
   402   $ hg transplant -s ../twin1 tip
       
   403   searching for changes
       
   404   warning: repository is unrelated
   404   applying 2e849d776c17
   405   applying 2e849d776c17
   405   2e849d776c17 transplanted to 589cea8ba85b
   406   2e849d776c17 transplanted to 8e65bebc063e
   406   $ cat b
   407   $ cat b
   407   a\r (esc)
   408   a\r (esc)
   408   b\r (esc)
   409   b\r (esc)
   409   $ cd ..
   410   $ cd ..