Mercurial > hg
changeset 6934:abb915d9d8db
Backed out changeset d557749c627a
Replace this change with a better one.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 24 Aug 2008 22:13:39 +0200 |
| parents | d557749c627a |
| children | 03916abdfb64 |
| files | mercurial/commands.py tests/test-addremove.out tests/test-casefolding.out tests/test-commit tests/test-commit.out tests/test-copy.out tests/test-hook.out tests/test-issue1175.out tests/test-keyword.out |
| diffstat | 9 files changed, 4 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Aug 22 13:25:35 2008 +0200 +++ b/mercurial/commands.py Sun Aug 24 22:13:39 2008 +0200 @@ -587,7 +587,6 @@ return cl = repo.changelog rev = cl.rev(node) - ui.note(_('committed changeset %s\n') % short(node)) parents = cl.parentrevs(rev) if rev - 1 in parents: # one of the parents was the old tip
--- a/tests/test-addremove.out Fri Aug 22 13:25:35 2008 +0200 +++ b/tests/test-addremove.out Sun Aug 24 22:13:39 2008 +0200 @@ -2,12 +2,10 @@ adding foo dir/bar foo -committed changeset d44511117907 adding dir/bar_2 adding foo_2 dir/bar_2 foo_2 -committed changeset a85812e0561a adding a adding c removing a
--- a/tests/test-casefolding.out Fri Aug 22 13:25:35 2008 +0200 +++ b/tests/test-casefolding.out Sun Aug 24 22:13:39 2008 +0200 @@ -5,7 +5,6 @@ % test case collision on rename (issue 750) adding a a -committed changeset 07f494440405 A: not overwriting - file exists % test case collision between revisions (issue 912) adding a
--- a/tests/test-commit Fri Aug 22 13:25:35 2008 +0200 +++ b/tests/test-commit Sun Aug 24 22:13:39 2008 +0200 @@ -7,6 +7,10 @@ hg add foo HGEDITOR=true hg commit -m "" hg commit -d '0 0' -m commit-1 +# An empty date was interpreted as epoch origin +echo foo >> foo +hg commit -d '' -m commit-no-date +hg tip --template '{date|isodate}\n' | grep '1970' echo foo >> foo hg commit -d '1 4444444' -m commit-3 hg commit -d '1 15.1' -m commit-4 @@ -48,10 +52,6 @@ hg commit -d '0 0' -m commit-16 quux echo >> dir/file hg -v commit -d '0 0' -m commit-17 dir/file -# An empty date was interpreted as epoch origin -echo foo >> foo -hg commit -d '' -m commit-no-date -hg tip --template '{date|isodate}\n' | grep '1970' cd .. echo % partial subdir commit test
--- a/tests/test-commit.out Fri Aug 22 13:25:35 2008 +0200 +++ b/tests/test-commit.out Sun Aug 24 22:13:39 2008 +0200 @@ -11,19 +11,16 @@ abort: file bar not found! adding dir/file dir/file -committed changeset d2a76177cb42 adding dir.file abort: no match under directory dir! abort: no match under directory .! abort: no match under directory ../dir2! dir/file -committed changeset 1cd62a2d8db5 does-not-exist: No such file or directory abort: file does-not-exist not found! abort: file baz not tracked! abort: file quux not tracked! dir/file -committed changeset 49176991390e % partial subdir commit test adding bar/bar adding foo/foo
--- a/tests/test-copy.out Fri Aug 22 13:25:35 2008 +0200 +++ b/tests/test-copy.out Sun Aug 24 22:13:39 2008 +0200 @@ -1,7 +1,6 @@ A b b b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 -committed changeset 386a3cc01532 we should see two history entries changeset: 1:386a3cc01532 tag: tip
--- a/tests/test-hook.out Fri Aug 22 13:25:35 2008 +0200 +++ b/tests/test-hook.out Sun Aug 24 22:13:39 2008 +0200 @@ -150,5 +150,4 @@ foo calling hook commit.auto: <function autohook> Automatically installed hook -committed changeset 52998019f625 hooks.commit.auto=<function autohook>
--- a/tests/test-issue1175.out Fri Aug 22 13:25:35 2008 +0200 +++ b/tests/test-issue1175.out Sun Aug 24 22:13:39 2008 +0200 @@ -8,7 +8,6 @@ b b: searching for copy revision for a b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db -committed changeset 755e75751bf6 checking changesets checking manifests crosschecking files in changesets and manifests
--- a/tests/test-keyword.out Fri Aug 22 13:25:35 2008 +0200 +++ b/tests/test-keyword.out Sun Aug 24 22:13:39 2008 +0200 @@ -117,7 +117,6 @@ b overwriting a expanding keywords running hook commit.test: cp a hooktest -committed changeset ef63ca68695b % status ? hooktest % identify @@ -224,7 +223,6 @@ c c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 overwriting c expanding keywords -committed changeset e22d299ac0c2 % cat a c expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ do not process $Id: @@ -282,7 +280,6 @@ % commit a overwriting a expanding keywords -committed changeset bb948857c743 % status % verify checking changesets @@ -309,7 +306,6 @@ 1: xxx $ 2: $Xinfo$ % remove -committed changeset d14c71265376 % status % rollback rolling back last transaction @@ -341,7 +337,6 @@ % commit rejecttest a overwriting a expanding keywords -committed changeset 85e279d709ff % export % import applying ../rejecttest.diff @@ -365,7 +360,6 @@ x/a x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e overwriting x/a expanding keywords -committed changeset cfa68229c116 % cat a expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $ do not process $Id: