Mercurial > hg
diff tests/test-keyword.out @ 10490:f2618cacb485 stable
filelog: sort meta entries, ensure deterministic order
author | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> |
---|---|
date | Tue, 16 Feb 2010 21:04:04 +0100 |
parents | 19c3fefdaec9 |
children | 4401b0dfee88 |
line wrap: on
line diff
--- a/tests/test-keyword.out Tue Feb 16 23:28:46 2010 +0100 +++ b/tests/test-keyword.out Tue Feb 16 21:04:04 2010 +0100 @@ -169,12 +169,12 @@ c c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 overwriting c expanding keywords -committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f +committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d % cat a c expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ do not process $Id: xxx $ -expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $ +expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $ do not process $Id: xxx $ % touch copied c @@ -320,9 +320,9 @@ x/a x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e overwriting x/a expanding keywords -committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e +committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 % cat a -expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $ +expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ do not process $Id: xxx $ $Xinfo: User Name <user@example.com>: xa $ @@ -364,11 +364,11 @@ # HG changeset patch # User User Name <user@example.com> # Date 3 0 -# Node ID cfa68229c1167443337266ebac453c73b1d5d16e +# Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4 # Parent bb948857c743469b22bbf51f7ec8112279ca5d83 xa -diff -r bb948857c743 -r cfa68229c116 x/a +diff -r bb948857c743 -r b4560182a3f9 x/a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/x/a Thu Jan 01 00:00:03 1970 +0000 @@ -0,0 +1,4 @@ @@ -400,7 +400,7 @@ created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -$Id: m 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $ +$Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $ foo % conflict 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -418,24 +418,24 @@ foo >>>>>>> other % resolve to local -$Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $ +$Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $ bar % test restricted mode with transplant -b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved marked working directory as branch foo created new head 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -applying 1c4378f51c4d -1c4378f51c4d transplanted to 7d855abcab87 +applying 4aa30d025d50 +4aa30d025d50 transplanted to 5a4da427c162 % no expansion in changeset -changeset: 11:7d855abcab87 +changeset: 11:5a4da427c162 tag: tip -parent: 9:43dfd2854b5b +parent: 9:41efa6d38e9b user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 9foobranch -diff -r 43dfd2854b5b -r 7d855abcab87 a +diff -r 41efa6d38e9b -r 5a4da427c162 a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +1,4 @@ @@ -446,7 +446,7 @@ % expansion in file foobranch -expand $Id: a 7d855abcab87 Thu, 01 Jan 1970 00:00:00 +0000 test $ +expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $ % switch off expansion % kwshrink with unknown file u overwriting a shrinking keywords