--- a/mercurial/commands.py Fri Apr 29 18:11:54 2011 -0300
+++ b/mercurial/commands.py Fri Apr 29 18:12:55 2011 -0300
@@ -4166,7 +4166,7 @@
commitopts2 = [
('d', 'date', '',
- _('record datecode as commit date'), _('DATE')),
+ _('record the specified date as commit date'), _('DATE')),
('u', 'user', '',
_('record the specified user as committer'), _('USER')),
]
--- a/tests/test-transplant.t Fri Apr 29 18:11:54 2011 -0300
+++ b/tests/test-transplant.t Fri Apr 29 18:12:55 2011 -0300
@@ -351,12 +351,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)