# HG changeset patch # User Mads Kiilerich # Date 2013-02-08 21:54:17 # Node ID 76b69cccb07a5675bbc37caaef3b5094fea07855 # Parent c1d23b4a66d51fbeb73cb2958826c0e901bbbcb8 export: show 'Date' header in a format that also is readable for humans 'export' is the official export format and used by patchbomb, but it would only show date as a timestamp that most humans might find it hard to relate to. It would be very convenient when reviewing a patch to be able to see what timestamp the patch will end up with. Mercurial has always used util.parsedate for parsing these headers. It can handle 'all' date formats, so we could just as well use a readable one. 'export' will now use the format used by 'log' - which is the format described as 'Unix date format' in the templating help. We assume that all parsers of '# HG changeset patch'es can handle that. diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -575,6 +575,7 @@ def export(repo, revs, template='hg-%h.p write("# HG changeset patch\n") write("# User %s\n" % ctx.user()) write("# Date %d %d\n" % ctx.date()) + write("# %s\n" % util.datestr(ctx.date())) if branch and branch != 'default': write("# Branch %s\n" % branch) write("# Node ID %s\n" % hex(node)) diff --git a/tests/test-alias.t b/tests/test-alias.t --- a/tests/test-alias.t +++ b/tests/test-alias.t @@ -181,6 +181,7 @@ path expanding # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID e63c23eaa88ae77967edcf4ea194d31167c478b0 # Parent 0000000000000000000000000000000000000000 foo @@ -224,7 +225,7 @@ simple shell aliases 2 $ hg tglog - @ 1:7e7f92de180e: 'bar' + @ 1:042423737847: 'bar' | o 0:e63c23eaa88a: 'foo' @@ -237,15 +238,15 @@ shadowing idalias idaliaslong idaliasshell identify import incoming init [255] $ hg id - 7e7f92de180e tip + 042423737847 tip $ hg ida hg: command 'ida' is ambiguous: idalias idaliaslong idaliasshell [255] $ hg idalias - 7e7f92de180e tip + 042423737847 tip $ hg idaliasl - 7e7f92de180e tip + 042423737847 tip $ hg idaliass test $ hg parentsshell diff --git a/tests/test-export.t b/tests/test-export.t --- a/tests/test-export.t +++ b/tests/test-export.t @@ -123,6 +123,7 @@ Exporting revision -2 to a file: # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 5f17a83f5fbd9414006a5e563eab4c8a00729efd # Parent 747d3c68f8ec44bb35816bfcd59aeb50b9654c2f foo-10 @@ -169,6 +170,7 @@ Check for color output # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID * (glob) # Parent * (glob) !"#$%&(,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -84,6 +84,7 @@ Graft a rename: # HG changeset patch # User foo # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82 # Parent 68795b066622ca79a25816a662041d8f78f3cd9e 2 @@ -324,6 +325,7 @@ Resolve conflicted graft # HG changeset patch # User bar # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 64ecd9071ce83c6e62f538d8ce7709d53f32ebf7 # Parent 4bdb9a9d0b84ffee1d30f0dfc7744cade17aa19c 1 @@ -351,6 +353,7 @@ Resolve conflicted graft with rename # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 2e80e1351d6ed50302fe1e05f8bd1d4d412b6e11 # Parent e5a51ae854a8bbaaf25cc5c6a57ff46042dadbb4 2 diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t --- a/tests/test-histedit-fold.t +++ b/tests/test-histedit-fold.t @@ -295,6 +295,7 @@ dropped revision. # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 10c647b2cdd54db0603ecb99b2ff5ce66d5a5323 # Parent 0189ba417d34df9dda55f88b637dcae9917b5964 +4 diff --git a/tests/test-import.t b/tests/test-import.t --- a/tests/test-import.t +++ b/tests/test-import.t @@ -34,7 +34,7 @@ import exported patch $ hg --cwd b import ../exported-tip.patch applying ../exported-tip.patch -message and committer should be same +message and committer and date should be same $ hg --cwd b tip changeset: 1:1d4bd90af0e4 @@ -853,6 +853,7 @@ in commit message # HG changeset patch # User User B # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID eb56ab91903632294ac504838508cb370c0901d2 # Parent 0000000000000000000000000000000000000000 from: tricky! diff --git a/tests/test-issue1175.t b/tests/test-issue1175.t --- a/tests/test-issue1175.t +++ b/tests/test-issue1175.t @@ -44,6 +44,7 @@ http://mercurial.selenic.com/bts/issue11 # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b # Parent 7fc86ba705e717a721dbc361bf8c9bc05a18ca2f 5 diff --git a/tests/test-keyword.t b/tests/test-keyword.t --- a/tests/test-keyword.t +++ b/tests/test-keyword.t @@ -528,6 +528,7 @@ Keywords should not be expanded in patch # HG changeset patch # User User Name # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 cndiff diff --git a/tests/test-patchbomb.t b/tests/test-patchbomb.t --- a/tests/test-patchbomb.t +++ b/tests/test-patchbomb.t @@ -27,6 +27,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -98,6 +99,7 @@ # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -126,6 +128,7 @@ # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -258,6 +261,7 @@ no mime encoding for email --test: # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f utf-8 content @@ -297,21 +301,23 @@ mime encoded mbox (base64): To: foo Cc: bar - IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojIE5vZGUgSUQgOTA5 - YTAwZTEzZTlkNzhiNTc1YWVlZTIzZGRkYmFkYTQ2ZDVhMTQzZgojIFBhcmVudCAgZmYyYzlmYTIw - MThiMTVmYTc0YjMzMzYzYmRhOTUyNzMyM2UyYTk5Zgp1dGYtOCBjb250ZW50CgpkaWZmIC1yIGZm - MmM5ZmEyMDE4YiAtciA5MDlhMDBlMTNlOWQgZGVzY3JpcHRpb24KLS0tIC9kZXYvbnVsbAlUaHUg - SmFuIDAxIDAwOjAwOjAwIDE5NzAgKzAwMDAKKysrIGIvZGVzY3JpcHRpb24JVGh1IEphbiAwMSAw - MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMyBAQAorYSBtdWx0aWxpbmUKKworZGVzY3Jp - cHRpb24KZGlmZiAtciBmZjJjOWZhMjAxOGIgLXIgOTA5YTAwZTEzZTlkIHV0ZgotLS0gL2Rldi9u - dWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3MCArMDAwMAorKysgYi91dGYJVGh1IEphbiAwMSAw - MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMSBAQAoraMO2bW1hIQo= + IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojICAgICAgVGh1IEph + biAwMSAwMDowMDowNCAxOTcwICswMDAwCiMgTm9kZSBJRCA5MDlhMDBlMTNlOWQ3OGI1NzVhZWVl + MjNkZGRiYWRhNDZkNWExNDNmCiMgUGFyZW50ICBmZjJjOWZhMjAxOGIxNWZhNzRiMzMzNjNiZGE5 + NTI3MzIzZTJhOTlmCnV0Zi04IGNvbnRlbnQKCmRpZmYgLXIgZmYyYzlmYTIwMThiIC1yIDkwOWEw + MGUxM2U5ZCBkZXNjcmlwdGlvbgotLS0gL2Rldi9udWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3 + MCArMDAwMAorKysgYi9kZXNjcmlwdGlvbglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAK + QEAgLTAsMCArMSwzIEBACithIG11bHRpbGluZQorCitkZXNjcmlwdGlvbgpkaWZmIC1yIGZmMmM5 + ZmEyMDE4YiAtciA5MDlhMDBlMTNlOWQgdXRmCi0tLSAvZGV2L251bGwJVGh1IEphbiAwMSAwMDow + MDowMCAxOTcwICswMDAwCisrKyBiL3V0ZglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAK + QEAgLTAsMCArMSwxIEBACitow7ZtbWEhCg== $ python -c 'print open("mbox").read().split("\n\n")[1].decode("base64")' # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f utf-8 content @@ -357,6 +363,7 @@ no mime encoding for email --test: # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -407,6 +414,7 @@ mime encoded mbox (quoted-printable): # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -465,6 +473,7 @@ fake ascii mbox: # HG changeset patch # User test # Date 5 0 + # Thu Jan 01 00:00:05 1970 +0000 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 isolatin 8-bit encoding @@ -513,6 +522,7 @@ test diffstat for single patch: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -590,6 +600,7 @@ test diffstat for multiple patches: # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -622,6 +633,7 @@ test diffstat for multiple patches: # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -659,6 +671,7 @@ test inline for single patch: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -698,6 +711,7 @@ test inline for single patch (quoted-pri # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -771,6 +785,7 @@ test inline for multiple patches: # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -805,6 +820,7 @@ test inline for multiple patches: # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -839,6 +855,7 @@ test inline for multiple patches: # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -902,6 +919,7 @@ test attach for single patch: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -949,6 +967,7 @@ test attach for single patch (quoted-pri # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -1002,6 +1021,7 @@ test attach and body for single patch: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1021,6 +1041,7 @@ test attach and body for single patch: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1087,6 +1108,7 @@ test attach for multiple patches: # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1130,6 +1152,7 @@ test attach for multiple patches: # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1173,6 +1196,7 @@ test attach for multiple patches: # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -1241,6 +1265,7 @@ test intro for single patch: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1291,6 +1316,7 @@ test --desc without --intro for a single # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1342,6 +1368,7 @@ test intro for multiple patches: # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1370,6 +1397,7 @@ test intro for multiple patches: # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1404,6 +1432,7 @@ test reply-to via config: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1438,6 +1467,7 @@ test reply-to via command line: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1480,6 +1510,7 @@ test inline for single named patch: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1536,6 +1567,7 @@ test inline for multiple named/unnamed p # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1570,6 +1602,7 @@ test inline for multiple named/unnamed p # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1607,6 +1640,7 @@ test inreplyto: # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 7aead2484924c445ad8ce2613df91f52f9e502ed # Parent 045ca29b1ea20e4940411e695e20e521f2f0f98e Added tag two, two.diff for changeset ff2c9fa2018b @@ -1646,6 +1680,7 @@ no intro message in non-interactive mode # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1674,6 +1709,7 @@ no intro message in non-interactive mode # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1728,6 +1764,7 @@ no intro message in non-interactive mode # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1756,6 +1793,7 @@ no intro message in non-interactive mode # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1789,6 +1827,7 @@ test single flag for single patch: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1840,6 +1879,7 @@ test single flag for multiple patches: # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1868,6 +1908,7 @@ test single flag for multiple patches: # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -1901,6 +1942,7 @@ test multiple flags for single patch: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -1952,6 +1994,7 @@ test multiple flags for multiple patches # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -1980,6 +2023,7 @@ test multiple flags for multiple patches # HG changeset patch # User test # Date 2 0 + # Thu Jan 01 00:00:02 1970 +0000 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab b @@ -2017,6 +2061,7 @@ test multi-address parsing: # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -2056,6 +2101,7 @@ test multi-byte domain parsing: # HG changeset patch # User test # Date 1 0 + # Thu Jan 01 00:00:01 1970 +0000 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab # Parent 0000000000000000000000000000000000000000 a @@ -2144,6 +2190,7 @@ test outgoing: # HG changeset patch # User test # Date 3 0 + # Thu Jan 01 00:00:03 1970 +0000 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 c @@ -2171,6 +2218,7 @@ test outgoing: # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f utf-8 content @@ -2205,6 +2253,7 @@ test outgoing: # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f long line @@ -2248,6 +2297,7 @@ test outgoing: # HG changeset patch # User test # Date 5 0 + # Thu Jan 01 00:00:05 1970 +0000 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 isolatin 8-bit encoding @@ -2275,6 +2325,7 @@ test outgoing: # HG changeset patch # User test # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433 # Parent 240fb913fc1b7ff15ddb9f33e73d82bf5277c720 Added tag zero, zero.foo for changeset 8580ff50825a @@ -2303,6 +2354,7 @@ test outgoing: # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Branch test # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 @@ -2338,6 +2390,7 @@ dest#branch URIs: # HG changeset patch # User test # Date 4 0 + # Thu Jan 01 00:00:04 1970 +0000 # Branch test # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t --- a/tests/test-rebase-collapse.t +++ b/tests/test-rebase-collapse.t @@ -569,6 +569,7 @@ Interactions between collapse and keepbr # HG changeset patch # User user1 # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 # Node ID f338eb3c2c7cc5b5915676a2376ba7ac558c5213 # Parent 41acb9dca9eb976e84cd21fcb756b4afa5a35c09 E diff --git a/tests/test-rebase-mq.t b/tests/test-rebase-mq.t --- a/tests/test-rebase-mq.t +++ b/tests/test-rebase-mq.t @@ -102,6 +102,7 @@ Fix the 2nd conflict: # HG changeset patch # User test # Date ?????????? ? (glob) + # * (glob) # Node ID ???????????????????????????????????????? (glob) # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0 P0 @@ -124,6 +125,7 @@ Update to qtip: # HG changeset patch # User test # Date ?????????? ? (glob) + # * (glob) # Node ID ???????????????????????????????????????? (glob) # Parent ???????????????????????????????????????? (glob) P1 @@ -209,6 +211,7 @@ Rebase the applied mq patches: # HG changeset patch # User test # Date ?????????? ? (glob) + # * (glob) # Node ID ???????????????????????????????????????? (glob) # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0 P0 (git) @@ -224,6 +227,7 @@ Rebase the applied mq patches: # HG changeset patch # User test # Date ?????????? ? (glob) + # * (glob) # Node ID ???????????????????????????????????????? (glob) # Parent ???????????????????????????????????????? (glob) P1