mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
c5def6fc1c
Example: % hg log | head -12 changeset: 791:41440890e57d2dbacde03a2a114e5114a031ea4a tag: tip user: Samuel Tardieu <sam@rfc1149.net> date: Mon Jul 25 13:24:15 2005 +0200 summary: Parse various date formats when accepting user specified dates [...] changeset: 787:ba5c2021364ee876dae170e8f153e43bd0b2bd73 parent: 785:31a80e3723cee0a5991340facb2707e71983eb41 user: Bryan O'Sullivan <bos@serpentine.com> date: Sun Jul 24 00:39:24 2005 -0800 summary: Get "forget" command to use new walk code. [...]
51 lines
982 B
Plaintext
51 lines
982 B
Plaintext
adding a
|
|
diff -r c19d34741b0a a
|
|
--- a/a
|
|
+++ b/a
|
|
@@ -1,1 +1,1 @@
|
|
-a
|
|
+abc
|
|
adding b
|
|
M a
|
|
resolving manifests
|
|
force None allow None moddirstate True linear True
|
|
ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
|
|
a versions differ, resolve
|
|
remote created b
|
|
getting b
|
|
merging a
|
|
resolving a
|
|
file a: other d730145abbf9 ancestor b789fdd96dc2
|
|
resolving manifests
|
|
force None allow 1 moddirstate True linear True
|
|
ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
|
|
changeset: 1:1e71731e6fbb
|
|
tag: tip
|
|
user: test
|
|
date: Thu Jan 1 00:00:00 1970 +0000
|
|
summary: 2
|
|
|
|
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
|
|
tag: tip
|
|
user: test
|
|
date: Thu Jan 1 00:00:00 1970 +0000
|
|
files: a b
|
|
description:
|
|
2
|
|
|
|
|
|
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
|
|
user: test
|
|
date: Thu Jan 1 00:00:00 1970 +0000
|
|
files: a
|
|
description:
|
|
1
|
|
|
|
|
|
diff -r 1e71731e6fbb a
|
|
--- a/a
|
|
+++ b/a
|
|
@@ -1,1 +1,1 @@
|
|
-a2
|
|
+abc
|