Mercurial > hg-stable
changeset 14015:39920ce75842
merge default heads
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Tue, 26 Apr 2011 12:56:56 +0200 |
| parents | b69471bdb678 (current diff) bcff4759d17d (diff) |
| children | bd738875943a |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-transplant.t Mon Apr 25 18:00:30 2011 +0800 +++ b/tests/test-transplant.t Tue Apr 26 12:56:56 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)