Mercurial > hg
changeset 14013:bcff4759d17d
merge with stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 25 Apr 2011 21:20:44 +0200 |
| parents | da65edcac72a (current diff) b247123d71f6 (diff) |
| children | 39920ce75842 |
| files | tests/test-transplant.t |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-transplant.t Sun Apr 24 17:30:50 2011 -0400 +++ b/tests/test-transplant.t Mon Apr 25 21:20:44 2011 +0200 @@ -397,12 +397,13 @@ $ echo '[patch]' >> .hg/hgrc $ echo 'eol = crlf' >> .hg/hgrc $ python -c "file('b', 'wb').write('b\r\nb\r\n')" - $ hg ci -m addb - nothing changed - [1] + $ hg ci -Am addb + adding b $ hg transplant -s ../twin1 tip + searching for changes + warning: repository is unrelated applying 2e849d776c17 - 2e849d776c17 transplanted to 589cea8ba85b + 2e849d776c17 transplanted to 8e65bebc063e $ cat b a\r (esc) b\r (esc)