##// END OF EJS Templates
test-transplant: fix missing file addition
Patrick Mezard -
r14012:b247123d stable
parent child Browse files
Show More
@@ -351,12 +351,13 b' test with a win32ext like setup (differi'
351 $ echo '[patch]' >> .hg/hgrc
351 $ echo '[patch]' >> .hg/hgrc
352 $ echo 'eol = crlf' >> .hg/hgrc
352 $ echo 'eol = crlf' >> .hg/hgrc
353 $ python -c "file('b', 'wb').write('b\r\nb\r\n')"
353 $ python -c "file('b', 'wb').write('b\r\nb\r\n')"
354 $ hg ci -m addb
354 $ hg ci -Am addb
355 nothing changed
355 adding b
356 [1]
357 $ hg transplant -s ../twin1 tip
356 $ hg transplant -s ../twin1 tip
357 searching for changes
358 warning: repository is unrelated
358 applying 2e849d776c17
359 applying 2e849d776c17
359 2e849d776c17 transplanted to 589cea8ba85b
360 2e849d776c17 transplanted to 8e65bebc063e
360 $ cat b
361 $ cat b
361 a\r (esc)
362 a\r (esc)
362 b\r (esc)
363 b\r (esc)
General Comments 0
You need to be logged in to leave comments. Login now