Mercurial > hg
changeset 19224:e9b571a8c67f stable
merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 21 May 2013 15:31:56 -0500 |
| parents | 475a4b13263f (diff) a182d7f81f66 (current diff) |
| children | 6cf8e3b4e074 41e39a0299cb ddfdccc9d5a4 |
| files | |
| diffstat | 8 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/de.po Tue May 21 14:10:55 2013 +0100 +++ b/i18n/de.po Tue May 21 15:31:56 2013 -0500 @@ -14078,13 +14078,14 @@ #, python-format msgid "was merge of '%s' successful (yn)?" -msgstr "" +msgstr "ist die Zusammenführung von '%s' gelungen (jn)?" #, python-format msgid "" " output file %s appears unchanged\n" "was merge successful (yn)?" -msgstr "" +msgstr "Ausgabedatei %s scheint unverändert\n" +"ist die Zusammenführung gelungen (jn)?" msgid "unterminated string" msgstr "nicht abgeschlossene Zeichenkette"
--- a/mercurial/commands.py Tue May 21 14:10:55 2013 +0100 +++ b/mercurial/commands.py Tue May 21 15:31:56 2013 -0500 @@ -4917,10 +4917,9 @@ """restore files to their checkout state .. note:: - To check out earlier revisions, you should use :hg:`update REV`. - To cancel an uncommitted merge (and lose your changes), use - :hg:`update --clean .`. + To cancel an uncommitted merge (and lose your changes), + use :hg:`update --clean .`. With no revision specified, revert the specified files or directories to the contents they had in the parent of the working directory.
--- a/mercurial/dirstate.py Tue May 21 14:10:55 2013 +0100 +++ b/mercurial/dirstate.py Tue May 21 15:31:56 2013 -0500 @@ -181,7 +181,7 @@ cwd = self.getcwd() path = util.pathto(self._root, cwd, f) if self._slash: - return util.normpath(path) + return util.pconvert(path) return path def __getitem__(self, key):
--- a/mercurial/help/urls.txt Tue May 21 14:10:55 2013 +0100 +++ b/mercurial/help/urls.txt Tue May 21 15:31:56 2013 -0500 @@ -7,8 +7,8 @@ ssh://[user@]host[:port]/[path][#revision] Paths in the local filesystem can either point to Mercurial -repositories or to bundle files (as created by :hg:`bundle` or :hg:` -incoming --bundle`). See also :hg:`help paths`. +repositories or to bundle files (as created by :hg:`bundle` or +:hg:`incoming --bundle`). See also :hg:`help paths`. An optional identifier after # indicates a particular branch, tag, or changeset to use from the remote repository. See also :hg:`help
--- a/tests/test-rebase-rename.t Tue May 21 14:10:55 2013 +0100 +++ b/tests/test-rebase-rename.t Tue May 21 15:31:56 2013 -0500 @@ -22,7 +22,7 @@ adding d/b $ hg mv d d-renamed - moving d/b to d-renamed/b + moving d/b to d-renamed/b (glob) $ hg ci -m 'rename B' $ hg up -q -C 1
--- a/tests/test-rename-dir-merge.t Tue May 21 14:10:55 2013 +0100 +++ b/tests/test-rename-dir-merge.t Tue May 21 15:31:56 2013 -0500 @@ -51,7 +51,7 @@ getting b/b updating: b/b 4/5 files (80.00%) updating: a/c 5/5 files (100.00%) - moving a/c to b/c + moving a/c to b/c (glob) 3 files updated, 0 files merged, 2 files removed, 0 files unresolved (branch merge, don't forget to commit)
--- a/tests/test-subrepo.t Tue May 21 14:10:55 2013 +0100 +++ b/tests/test-subrepo.t Tue May 21 15:31:56 2013 -0500 @@ -391,7 +391,7 @@ $ hg -R s update '.^' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg push - pushing to $TESTTMP/t + pushing to $TESTTMP/t (glob) no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) no changes made to subrepo s since last push to $TESTTMP/t/s no changes made to subrepo t since last push to $TESTTMP/t/t @@ -400,7 +400,7 @@ [1] $ echo foo >> s/a $ hg push - pushing to $TESTTMP/t + pushing to $TESTTMP/t (glob) no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) no changes made to subrepo s since last push to $TESTTMP/t/s no changes made to subrepo t since last push to $TESTTMP/t/t @@ -415,7 +415,7 @@ $ echo foo >> s/ss/a $ hg -R s/ss commit -m 'test dirty store detection' $ hg push - pushing to $TESTTMP/t + pushing to $TESTTMP/t (glob) pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) searching for changes adding changesets @@ -431,7 +431,7 @@ a subrepo store may be clean versus one repo but not versus another $ hg push - pushing to $TESTTMP/t + pushing to $TESTTMP/t (glob) no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) no changes made to subrepo s since last push to $TESTTMP/t/s no changes made to subrepo t since last push to $TESTTMP/t/t @@ -798,7 +798,7 @@ Try to push from the other side $ hg -R issue1852a push `pwd`/issue1852c - pushing to $TESTTMP/issue1852c + pushing to $TESTTMP/issue1852c (glob) pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob) searching for changes no changes found
--- a/tests/test-tag.t Tue May 21 14:10:55 2013 +0100 +++ b/tests/test-tag.t Tue May 21 15:31:56 2013 -0500 @@ -316,7 +316,7 @@ adding test $ hg init repo-tag-target $ hg -R repo-tag --config hooks.commit="\"hg\" push \"`pwd`/repo-tag-target\"" tag tag - pushing to $TESTTMP/repo-tag-target + pushing to $TESTTMP/repo-tag-target (glob) searching for changes adding changesets adding manifests