equal
deleted
inserted
replaced
1 + hg init |
|
2 + hg addremove |
|
3 adding a |
1 adding a |
4 + hg commit -m 1 -d 0 0 |
|
5 + hg clone . ../r2 |
|
6 + hg up |
|
7 + hg diff |
|
8 diff -r c19d34741b0a a |
2 diff -r c19d34741b0a a |
9 --- a/a |
3 --- a/a |
10 +++ b/a |
4 +++ b/a |
11 @@ -1,1 +1,1 @@ |
5 @@ -1,1 +1,1 @@ |
12 -a |
6 -a |
13 +abc |
7 +abc |
14 + hg addremove |
|
15 adding b |
8 adding b |
16 + hg commit -m 2 -d 0 0 |
|
17 + hg -q pull ../r1 |
|
18 + hg status |
|
19 M a |
9 M a |
20 + hg --debug up |
|
21 resolving manifests |
10 resolving manifests |
22 force None allow None moddirstate True linear True |
11 force None allow None moddirstate True linear True |
23 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
12 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
24 a versions differ, resolve |
13 a versions differ, resolve |
25 remote created b |
14 remote created b |
26 getting b |
15 getting b |
27 merging a |
16 merging a |
28 resolving a |
17 resolving a |
29 file a: other d730145abbf9 ancestor b789fdd96dc2 |
18 file a: other d730145abbf9 ancestor b789fdd96dc2 |
30 + hg --debug up -m |
|
31 resolving manifests |
19 resolving manifests |
32 force None allow 1 moddirstate True linear True |
20 force None allow 1 moddirstate True linear True |
33 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
21 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
34 + hg parents |
|
35 changeset: 1:1e71731e6fbb |
22 changeset: 1:1e71731e6fbb |
36 tag: tip |
23 tag: tip |
37 user: test |
24 user: test |
38 date: Thu Jan 1 00:00:00 1970 |
25 date: Thu Jan 1 00:00:00 1970 |
39 summary: 2 |
26 summary: 2 |
40 |
27 |
41 + hg -v history |
|
42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
28 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
43 tag: tip |
29 tag: tip |
44 user: test |
30 user: test |
45 date: Thu Jan 1 00:00:00 1970 |
31 date: Thu Jan 1 00:00:00 1970 |
46 files: a b |
32 files: a b |
54 files: a |
40 files: a |
55 description: |
41 description: |
56 1 |
42 1 |
57 |
43 |
58 |
44 |
59 + hg diff |
|
60 diff -r 1e71731e6fbb a |
45 diff -r 1e71731e6fbb a |
61 --- a/a |
46 --- a/a |
62 +++ b/a |
47 +++ b/a |
63 @@ -1,1 +1,1 @@ |
48 @@ -1,1 +1,1 @@ |
64 -a2 |
49 -a2 |