Mercurial > hg

annotate tests/test-up-local-change.out @ 332:6c869059beb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
testing fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 testing fixups Add note about running tests to README Fix issue with pipelines and set -x output stability Add note about stability issue to README manifest hash: 7e8d9da463b3110664e24978550faab3ef67a706 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr0/FywK+sNU5EO8RAnWXAJ4toFrvgtsPfR3dYs9a81AsOrfiVQCfZKIf yJCboAnoJNSSjyUk42ALMxs= =YJ31 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 14 Jun 2005 13:44:37 -0800
parents 55f63f3b6a54
children b2293093b89e b4e0e20646bb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
1 + mkdir r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
2 + cd r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 + hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
4 + echo a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 + hg addremove
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6 + hg commit -t 1 -u test -d '0 0'
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
7 + cd ..
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
8 + mkdir r2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
9 + cd r2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
10 + hg init ../r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
11 + hg up
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
12 + echo abc
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
13 + hg diff
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
14 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
15 --- a/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
16 +++ b/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
17 @@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
18 -a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
19 +abc
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
20 + cd ../r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
21 + echo b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
22 + echo a2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
23 + hg addremove
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
24 + hg commit -t 2 -u test -d '0 0'
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
25 + cd ../r2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
26 + hg -q pull ../r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
27 + hg status
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
28 C a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
29 + hg -d up
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
30 resolving manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
31 ancestor a0c8bcbb local a0c8bcbb remote 1165e8bd
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
32 a versions differ, resolve
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
33 remote created b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
34 getting b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
35 merging a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
36 resolving a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
37 file a: other d730145a ancestor b789fdd9
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
38 + hg -d up -m
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
39 resolving manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
40 ancestor 1165e8bd local 1165e8bd remote 1165e8bd
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
41 + hg parents
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
43 user: test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
44 date: Wed Dec 31 16:00:00 1969
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
45 summary: 2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
46
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
47 + hg -v history
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
48 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
49 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
50 user: test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
51 date: Wed Dec 31 16:00:00 1969
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
52 files: a b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
53 description:
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
54 2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
55
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
56 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
57 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
58 user: test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
59 date: Wed Dec 31 16:00:00 1969
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
60 files: a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
61 description:
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
62 1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
63
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
64 + hg diff
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
65 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
66 --- a/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
67 +++ b/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
68 @@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
69 -a2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
70 +abc