Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-merge2.out @ 4311:4787e2b0dd03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix a bug where copies were ignored
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Apr 2007 16:43:18 -0500
parents d377f8d25662
children bb1800a7d7e1
comparison
equal deleted inserted replaced
4273:8185a1ca8628 4311:4787e2b0dd03
86 -------------- 86 --------------
87 resolving manifests 87 resolving manifests
88 overwrite None partial False 88 overwrite None partial False
89 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7 89 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7
90 rev: versions differ -> m 90 rev: versions differ -> m
91 b: remote created -> g 91 a: remote copied to b -> m
92 getting b 92 copying a to b
93 merging rev 93 merging rev
94 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 94 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337
95 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 95 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
96 (branch merge, don't forget to commit) 96 (branch merge, don't forget to commit)
97 -------------- 97 --------------
98 M b 98 M b
99 a
99 C a 100 C a
100 -------------- 101 --------------
101 102
102 -------------- 103 --------------
103 test L:nc a b R: W: - 6 nothing 104 test L:nc a b R: W: - 6 nothing
104 -------------- 105 --------------
105 resolving manifests 106 resolving manifests
106 overwrite None partial False 107 overwrite None partial False
107 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 108 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336
109 b: local copied to a -> m
108 rev: versions differ -> m 110 rev: versions differ -> m
109 merging rev 111 merging rev
110 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 112 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337
111 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 113 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
112 (branch merge, don't forget to commit) 114 (branch merge, don't forget to commit)
113 -------------- 115 --------------
116 M b
117 a
114 C a 118 C a
115 C b
116 -------------- 119 --------------
117 120
118 -------------- 121 --------------
119 test L: R:nm a b W: - 7 get b 122 test L: R:nm a b W: - 7 get b
120 -------------- 123 --------------
121 resolving manifests 124 resolving manifests
122 overwrite None partial False 125 overwrite None partial False
123 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b 126 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b
124 a: other deleted -> r 127 rev: versions differ -> m
125 rev: versions differ -> m 128 a: remote moved to b -> m
126 b: remote created -> g 129 copying a to b
127 removing a 130 removing a
128 getting b
129 merging rev 131 merging rev
130 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 132 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337
131 1 files updated, 1 files merged, 1 files removed, 0 files unresolved 133 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
132 (branch merge, don't forget to commit) 134 (branch merge, don't forget to commit)
133 -------------- 135 --------------
134 M b 136 M b
137 a
135 -------------- 138 --------------
136 139
137 -------------- 140 --------------
138 test L:nm a b R: W: - 8 nothing 141 test L:nm a b R: W: - 8 nothing
139 -------------- 142 --------------
140 resolving manifests 143 resolving manifests
141 overwrite None partial False 144 overwrite None partial False
142 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 145 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336
146 b: local moved to a -> m
143 rev: versions differ -> m 147 rev: versions differ -> m
144 merging rev 148 merging rev
145 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 149 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337
146 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 150 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
147 (branch merge, don't forget to commit) 151 (branch merge, don't forget to commit)
148 -------------- 152 --------------
149 C b 153 M b
154 a
150 -------------- 155 --------------
151 156
152 -------------- 157 --------------
153 test L:um a b R:um a b W: - 9 do merge with ancestor in a 158 test L:um a b R:um a b W: - 9 do merge with ancestor in a
154 -------------- 159 --------------