mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
2898765c52
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed extra newline in hg log when not using the --patch option, fixed tests. manifest hash: 4d83d4af68581affe4cd2dacf840ec78bf18311e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1jJdW7P1GVgWeRoRAkoIAJ4kI8WFisp8fJTMsUCddLwK0O1mHQCgj+fx XDIXrDpUULYSSck3eD4QHY4= =jKKB -----END PGP SIGNATURE-----
77 lines
1.5 KiB
Plaintext
77 lines
1.5 KiB
Plaintext
+ mkdir r1
|
|
+ cd r1
|
|
+ hg init
|
|
+ echo a
|
|
+ hg addremove
|
|
+ hg commit -t 1 -u test -d '0 0'
|
|
+ hg clone . ../r2
|
|
+ cd ../r2
|
|
+ hg up
|
|
+ echo abc
|
|
+ hg diff
|
|
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'
|
|
diff -r c19d34741b0a a
|
|
--- a/a
|
|
+++ b/a
|
|
@@ -1,1 +1,1 @@
|
|
-a
|
|
+abc
|
|
+ cd ../r1
|
|
+ echo b
|
|
+ echo a2
|
|
+ hg addremove
|
|
+ hg commit -t 2 -u test -d '0 0'
|
|
+ cd ../r2
|
|
+ hg -q pull ../r1
|
|
+ hg status
|
|
C a
|
|
+ hg --debug up
|
|
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
|
|
+ hg --debug up -m
|
|
resolving manifests
|
|
force None allow 1 moddirstate True linear True
|
|
ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
|
|
+ hg parents
|
|
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
|
|
tag: tip
|
|
user: test
|
|
date: Thu Jan 1 00:00:00 1970
|
|
summary: 2
|
|
|
|
+ hg -v history
|
|
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
|
|
tag: tip
|
|
manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
|
|
user: test
|
|
date: Thu Jan 1 00:00:00 1970
|
|
files: a b
|
|
description:
|
|
2
|
|
|
|
|
|
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
|
|
manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
|
|
user: test
|
|
date: Thu Jan 1 00:00:00 1970
|
|
files: a
|
|
description:
|
|
1
|
|
|
|
|
|
+ hg diff
|
|
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'
|
|
diff -r 1e71731e6fbb a
|
|
--- a/a
|
|
+++ b/a
|
|
@@ -1,1 +1,1 @@
|
|
-a2
|
|
+abc
|