annotate tests/test-up-local-change.out @ 490:df9b77f67998

Make show_changeset show added and deleted files in verbose mode.

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Make show_changeset show added and deleted files in verbose mode.

manifest hash: 189c2da64862f471b75b9d205907bff86c7423a3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCv4voW7P1GVgWeRoRAlLaAJsHGWEfNMMfDdsnk9/G9w86nf2I2QCgi4Rc
3HgiUFeTPi71I0tH+SV5Gsc=
=/see
-----END PGP SIGNATURE-----

+ 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 -d up
resolving manifests
 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 -d up -m
resolving manifests
 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
files+:      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