Mercurial > hg
diff tests/test-log.t @ 25855:96a38d44ba09 stable 3.5-rc
merge with default for code freeze
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 18 Jul 2015 17:32:38 -0500 |
parents | f4412380d357 |
children | 5618858dce26 |
line wrap: on
line diff
--- a/tests/test-log.t Fri Jul 03 18:10:58 2015 +0100 +++ b/tests/test-log.t Sat Jul 18 17:32:38 2015 -0500 @@ -148,7 +148,7 @@ $ hg log -f -l1 --style something abort: style 'something' not found - (available styles: bisect, changelog, compact, default, phases, xml) + (available styles: bisect, changelog, compact, default, phases, status, xml) [255] -f, phases style @@ -1626,15 +1626,16 @@ working-directory revision requires special treatment $ hg log -r 'wdir()' - changeset: 0:65624cd9070a+ + changeset: 2147483647:ffffffffffff + parent: 0:65624cd9070a user: test date: [A-Za-z0-9:+ ]+ (re) $ hg log -r 'wdir()' -q - 0:65624cd9070a+ + 2147483647:ffffffffffff $ hg log -r 'wdir()' --debug - changeset: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08+ + changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff phase: draft parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08 parent: -1:0000000000000000000000000000000000000000 @@ -1653,7 +1654,7 @@ "date": [*, 0], (glob) "desc": "", "bookmarks": [], - "tags": ["tip"], + "tags": [], "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"] } ] @@ -1677,7 +1678,7 @@ "date": [*, 0], (glob) "desc": "", "bookmarks": [], - "tags": ["tip"], + "tags": [], "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"], "manifest": null, "extra": {"branch": "default"},