Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 2830:49988d9f0758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew, fix most tests
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Aug 2006 13:55:18 -0500
parents 30f59f4a327e
children 013921c753bd
comparison
equal deleted inserted replaced
2829:4870f795f681 2830:49988d9f0758
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 False allow False moddirstate True linear True 20 overwrite False branchmerge False partial False 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 False allow False moddirstate True linear True 36 overwrite False branchmerge False partial False 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 False allow False moddirstate True linear True 54 overwrite False branchmerge False partial False 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
96 changeset: 1:802f095af299 96 changeset: 1:802f095af299
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 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
102 force False allow False moddirstate True linear False
103 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
104 a versions differ, resolve
105 b versions differ, resolve
106 this update spans a branch affecting the following files:
107 a (resolve)
108 b (resolve)
109 aborting update spanning branches!
110 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
111 failed 102 failed
112 abort: outstanding uncommitted changes 103 abort: outstanding uncommitted changes
113 failed 104 failed
114 resolving manifests 105 resolving manifests
115 force False allow True moddirstate True linear False 106 overwrite False branchmerge True partial False linear False
116 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 107 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
117 a versions differ, resolve 108 a versions differ, resolve
118 b versions differ, resolve 109 b versions differ, resolve
119 merging a 110 merging a
120 resolving a 111 resolving a