Mercurial > hg
comparison tests/test-up-local-change.out @ 2808:30f59f4a327e
Introduce update helper functions: update, merge, clean, and revert
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 07 Aug 2006 22:54:33 -0500 |
parents | bb403d427974 |
children | 49988d9f0758 |
comparison
equal
deleted
inserted
replaced
2807:a8a7ce1a01a5 | 2808:30f59f4a327e |
---|---|
15 user: test | 15 user: test |
16 date: Mon Jan 12 13:46:40 1970 +0000 | 16 date: Mon Jan 12 13:46:40 1970 +0000 |
17 summary: 1 | 17 summary: 1 |
18 | 18 |
19 resolving manifests | 19 resolving manifests |
20 force None allow None moddirstate True linear True | 20 force False allow False moddirstate True linear True |
21 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e | 21 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
22 a versions differ, resolve | 22 a versions differ, resolve |
23 remote created b | 23 remote created b |
24 getting b | 24 getting b |
25 merging a | 25 merging a |
31 user: test | 31 user: test |
32 date: Mon Jan 12 13:46:40 1970 +0000 | 32 date: Mon Jan 12 13:46:40 1970 +0000 |
33 summary: 2 | 33 summary: 2 |
34 | 34 |
35 resolving manifests | 35 resolving manifests |
36 force None allow None moddirstate True linear True | 36 force False allow False moddirstate True linear True |
37 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c | 37 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c |
38 remote deleted b | 38 remote deleted b |
39 removing b | 39 removing b |
40 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 40 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
41 changeset: 0:33aaa84a386b | 41 changeset: 0:33aaa84a386b |
49 user: test | 49 user: test |
50 date: Mon Jan 12 13:46:40 1970 +0000 | 50 date: Mon Jan 12 13:46:40 1970 +0000 |
51 summary: 1 | 51 summary: 1 |
52 | 52 |
53 resolving manifests | 53 resolving manifests |
54 force None allow None moddirstate True linear True | 54 force False allow False moddirstate True linear True |
55 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e | 55 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
56 a versions differ, resolve | 56 a versions differ, resolve |
57 remote created b | 57 remote created b |
58 getting b | 58 getting b |
59 merging a | 59 merging a |
97 user: test | 97 user: test |
98 date: Mon Jan 12 13:46:40 1970 +0000 | 98 date: Mon Jan 12 13:46:40 1970 +0000 |
99 summary: 2 | 99 summary: 2 |
100 | 100 |
101 resolving manifests | 101 resolving manifests |
102 force None allow None moddirstate True linear False | 102 force False allow False moddirstate True linear False |
103 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 | 103 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 |
104 a versions differ, resolve | 104 a versions differ, resolve |
105 b versions differ, resolve | 105 b versions differ, resolve |
106 this update spans a branch affecting the following files: | 106 this update spans a branch affecting the following files: |
107 a (resolve) | 107 a (resolve) |