Mercurial > hg > gitweb
annotate tests/test-rename-merge2.out @ 4379:80c7fa620a4d
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 26 Apr 2007 18:41:18 -0500 |
| parents | 4787e2b0dd03 |
| children | bb1800a7d7e1 |
| rev | line source |
|---|---|
| 3252 | 1 -------------- |
| 2 test L:up a R:nc a b W: - 1 get local a to b | |
| 3 -------------- | |
| 4 resolving manifests | |
| 3314 | 5 overwrite None partial False |
| 6 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 | |
| 3252 | 7 rev: versions differ -> m |
|
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
8 a: remote copied to b -> m |
|
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
9 merging a and b |
| 3314 | 10 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
| 3252 | 11 copying a to b |
| 12 merging rev | |
| 3314 | 13 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 |
| 3252 | 14 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 15 (branch merge, don't forget to commit) | |
| 16 -------------- | |
|
3282
438b0638dbf5
Fix undetected change bug in rename tests
Matt Mackall <mpm@selenic.com>
parents:
3281
diff
changeset
|
17 M a |
| 3252 | 18 M b |
| 19 a | |
| 20 -------------- | |
| 21 | |
| 22 -------------- | |
| 23 test L:nc a b R:up a W: - 2 get rem change to a and b | |
| 24 -------------- | |
| 25 resolving manifests | |
| 3314 | 26 overwrite None partial False |
| 27 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 | |
| 3252 | 28 a: remote is newer -> g |
|
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
29 b: local copied to a -> m |
| 3252 | 30 rev: versions differ -> m |
| 31 getting a | |
|
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
32 merging b and a |
| 3314 | 33 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 3252 | 34 merging rev |
| 3314 | 35 my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
| 3252 | 36 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 37 (branch merge, don't forget to commit) | |
| 38 -------------- | |
| 39 M a | |
| 40 M b | |
|
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
41 a |
| 3252 | 42 -------------- |
| 43 | |
| 44 -------------- | |
| 45 test L:up a R:nm a b W: - 3 get local a change to b, remove a | |
| 46 -------------- | |
| 47 resolving manifests | |
| 3314 | 48 overwrite None partial False |
| 49 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b | |
|
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
50 rev: versions differ -> m |
|
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
51 a: remote moved to b -> m |
|
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
52 merging a and b |
| 3314 | 53 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
| 3252 | 54 copying a to b |
| 55 removing a | |
| 56 merging rev | |
| 3314 | 57 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 |
| 3252 | 58 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 59 (branch merge, don't forget to commit) | |
| 60 -------------- | |
| 61 M b | |
| 62 a | |
| 63 -------------- | |
| 64 | |
| 65 -------------- | |
| 66 test L:nm a b R:up a W: - 4 get remote change to b | |
| 67 -------------- | |
| 68 resolving manifests | |
| 3314 | 69 overwrite None partial False |
| 70 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 | |
|
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
71 b: local moved to a -> m |
| 3252 | 72 rev: versions differ -> m |
|
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
73 merging b and a |
| 3314 | 74 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 3252 | 75 merging rev |
| 3314 | 76 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
| 3252 | 77 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 78 (branch merge, don't forget to commit) | |
| 79 -------------- | |
| 80 M b | |
|
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
81 a |
| 3252 | 82 -------------- |
| 83 | |
| 84 -------------- | |
| 85 test L: R:nc a b W: - 5 get b | |
| 86 -------------- | |
| 87 resolving manifests | |
| 3314 | 88 overwrite None partial False |
| 89 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7 | |
| 3252 | 90 rev: versions differ -> m |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
91 a: remote copied to b -> m |
|
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
92 copying a to b |
| 3252 | 93 merging rev |
| 3314 | 94 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 |
|
3400
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
95 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 3252 | 96 (branch merge, don't forget to commit) |
| 97 -------------- | |
| 98 M b | |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
99 a |
|
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
100 C a |
| 3252 | 101 -------------- |
| 102 | |
| 103 -------------- | |
| 104 test L:nc a b R: W: - 6 nothing | |
| 105 -------------- | |
| 106 resolving manifests | |
| 3314 | 107 overwrite None partial False |
| 108 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 | |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
109 b: local copied to a -> m |
| 3252 | 110 rev: versions differ -> m |
| 111 merging rev | |
| 3314 | 112 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
113 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 3252 | 114 (branch merge, don't forget to commit) |
| 115 -------------- | |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
116 M b |
|
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
117 a |
| 3252 | 118 C a |
| 119 -------------- | |
| 120 | |
| 121 -------------- | |
| 122 test L: R:nm a b W: - 7 get b | |
| 123 -------------- | |
| 124 resolving manifests | |
| 3314 | 125 overwrite None partial False |
| 126 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b | |
| 3252 | 127 rev: versions differ -> m |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
128 a: remote moved to b -> m |
|
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
129 copying a to b |
| 3252 | 130 removing a |
| 131 merging rev | |
| 3314 | 132 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
133 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 3252 | 134 (branch merge, don't forget to commit) |
| 135 -------------- | |
| 136 M b | |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
137 a |
| 3252 | 138 -------------- |
| 139 | |
| 140 -------------- | |
| 141 test L:nm a b R: W: - 8 nothing | |
| 142 -------------- | |
| 143 resolving manifests | |
| 3314 | 144 overwrite None partial False |
| 145 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 | |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
146 b: local moved to a -> m |
| 3252 | 147 rev: versions differ -> m |
| 148 merging rev | |
| 3314 | 149 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
150 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 3252 | 151 (branch merge, don't forget to commit) |
| 152 -------------- | |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
153 M b |
|
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
154 a |
| 3252 | 155 -------------- |
| 156 | |
| 157 -------------- | |
| 158 test L:um a b R:um a b W: - 9 do merge with ancestor in a | |
| 159 -------------- | |
| 160 resolving manifests | |
| 3314 | 161 overwrite None partial False |
| 162 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7 | |
| 3252 | 163 b: versions differ -> m |
| 164 rev: versions differ -> m | |
| 165 merging b | |
| 3314 | 166 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 |
| 3252 | 167 merging rev |
| 3314 | 168 my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
| 3252 | 169 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 170 (branch merge, don't forget to commit) | |
| 171 -------------- | |
| 172 M b | |
| 173 -------------- | |
| 174 | |
| 175 -------------- | |
| 176 test L:nm a b R:nm a c W: - 11 get c, keep b | |
| 177 -------------- | |
| 178 resolving manifests | |
| 3314 | 179 overwrite None partial False |
| 180 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2 | |
| 3252 | 181 rev: versions differ -> m |
| 182 c: remote created -> g | |
| 183 getting c | |
| 184 merging rev | |
| 3314 | 185 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337 |
| 3252 | 186 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 187 (branch merge, don't forget to commit) | |
| 188 -------------- | |
| 189 M c | |
| 190 C b | |
| 191 -------------- | |
| 192 | |
| 193 -------------- | |
| 194 test L:nc a b R:up b W: - 12 merge b no ancestor | |
| 195 -------------- | |
| 196 resolving manifests | |
| 3314 | 197 overwrite None partial False |
| 198 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7 | |
| 3252 | 199 b: versions differ -> m |
| 200 rev: versions differ -> m | |
| 201 merging b | |
| 3314 | 202 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 |
| 3252 | 203 merging rev |
| 3314 | 204 my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
| 3252 | 205 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 206 (branch merge, don't forget to commit) | |
| 207 -------------- | |
| 208 M b | |
| 209 C a | |
| 210 -------------- | |
| 211 | |
| 212 -------------- | |
| 213 test L:up b R:nm a b W: - 13 merge b no ancestor | |
| 214 -------------- | |
| 215 resolving manifests | |
| 3314 | 216 overwrite None partial False |
| 217 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
| 3252 | 218 a: other deleted -> r |
| 219 b: versions differ -> m | |
| 220 rev: versions differ -> m | |
| 221 removing a | |
| 222 merging b | |
| 3314 | 223 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
| 3252 | 224 merging rev |
| 3314 | 225 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
| 3252 | 226 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
| 227 (branch merge, don't forget to commit) | |
| 228 -------------- | |
| 229 M b | |
| 230 -------------- | |
| 231 | |
| 232 -------------- | |
| 233 test L:nc a b R:up a b W: - 14 merge b no ancestor | |
| 234 -------------- | |
| 235 resolving manifests | |
| 3314 | 236 overwrite None partial False |
| 237 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
| 3252 | 238 a: remote is newer -> g |
| 239 b: versions differ -> m | |
| 240 rev: versions differ -> m | |
| 241 getting a | |
| 242 merging b | |
| 3314 | 243 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
| 3252 | 244 merging rev |
| 3314 | 245 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 3252 | 246 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 247 (branch merge, don't forget to commit) | |
| 248 -------------- | |
| 249 M a | |
| 250 M b | |
| 251 -------------- | |
| 252 | |
| 253 -------------- | |
| 254 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a | |
| 255 -------------- | |
| 256 resolving manifests | |
| 3314 | 257 overwrite None partial False |
| 258 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
| 3252 | 259 a: other deleted -> r |
| 260 b: versions differ -> m | |
| 261 rev: versions differ -> m | |
| 262 removing a | |
| 263 merging b | |
| 3314 | 264 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
| 3252 | 265 merging rev |
| 3314 | 266 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
| 3252 | 267 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
| 268 (branch merge, don't forget to commit) | |
| 269 -------------- | |
| 270 M b | |
| 271 -------------- | |
| 272 | |
| 273 -------------- | |
| 3281 | 274 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
| 3252 | 275 -------------- |
| 276 resolving manifests | |
| 3314 | 277 overwrite None partial False |
| 278 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
| 3252 | 279 a: remote is newer -> g |
| 280 b: versions differ -> m | |
| 281 rev: versions differ -> m | |
| 282 getting a | |
| 283 merging b | |
| 3314 | 284 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
| 3252 | 285 merging rev |
| 3314 | 286 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 3252 | 287 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 288 (branch merge, don't forget to commit) | |
| 289 -------------- | |
| 290 M a | |
| 291 M b | |
| 292 -------------- | |
| 293 | |
| 294 -------------- | |
| 3281 | 295 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
| 3252 | 296 -------------- |
| 297 resolving manifests | |
| 3314 | 298 overwrite None partial False |
| 299 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7 | |
| 3252 | 300 b: versions differ -> m |
| 301 rev: versions differ -> m | |
| 302 merging b | |
| 3314 | 303 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 |
| 3252 | 304 merging rev |
| 3314 | 305 my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337 |
| 3252 | 306 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 307 (branch merge, don't forget to commit) | |
| 308 -------------- | |
| 309 M b | |
| 310 C a | |
| 311 -------------- | |
| 312 | |
| 313 -------------- | |
| 314 test L:nm a b R:up a b W: - 18 merge b no ancestor | |
| 315 -------------- | |
| 316 resolving manifests | |
| 3314 | 317 overwrite None partial False |
| 318 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a | |
| 3252 | 319 b: versions differ -> m |
| 320 rev: versions differ -> m | |
| 321 a: prompt recreating -> g | |
| 322 getting a | |
| 323 merging b | |
| 3314 | 324 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000 |
| 3252 | 325 merging rev |
| 3314 | 326 my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337 |
| 3252 | 327 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 328 (branch merge, don't forget to commit) | |
| 329 -------------- | |
| 330 M a | |
| 331 M b | |
| 332 -------------- | |
| 333 | |
| 334 -------------- | |
| 3281 | 335 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
| 3252 | 336 -------------- |
| 337 resolving manifests | |
| 3314 | 338 overwrite None partial False |
| 339 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b | |
| 3252 | 340 b: versions differ -> m |
| 341 rev: versions differ -> m | |
| 342 merging b | |
| 3314 | 343 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 |
| 3252 | 344 merging rev |
| 3314 | 345 my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337 |
| 3252 | 346 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 347 (branch merge, don't forget to commit) | |
| 348 -------------- | |
| 349 M b | |
| 350 C a | |
| 351 -------------- | |
| 352 | |
| 353 -------------- | |
| 354 test L:up a R:um a b W: - 20 merge a and b to b, remove a | |
| 355 -------------- | |
| 356 resolving manifests | |
| 3314 | 357 overwrite None partial False |
| 358 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 | |
|
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
359 rev: versions differ -> m |
|
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
360 a: remote moved to b -> m |
|
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
361 merging a and b |
| 3314 | 362 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
| 3252 | 363 copying a to b |
| 364 removing a | |
| 365 merging rev | |
| 3314 | 366 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
| 3252 | 367 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 368 (branch merge, don't forget to commit) | |
| 369 -------------- | |
| 370 M b | |
| 371 a | |
| 372 -------------- | |
| 373 | |
| 374 -------------- | |
| 375 test L:um a b R:up a W: - 21 merge a and b to b | |
| 376 -------------- | |
| 377 resolving manifests | |
| 3314 | 378 overwrite None partial False |
| 379 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 | |
|
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
380 b: local moved to a -> m |
| 3252 | 381 rev: versions differ -> m |
|
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
382 merging b and a |
| 3314 | 383 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 |
| 3252 | 384 merging rev |
| 3314 | 385 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
| 3252 | 386 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 387 (branch merge, don't forget to commit) | |
| 388 -------------- | |
| 389 M b | |
|
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
390 a |
| 3252 | 391 -------------- |
| 392 | |
| 393 -------------- | |
| 394 test L:nm a b R:up a c W: - 23 get c, keep b | |
| 395 -------------- | |
| 396 resolving manifests | |
| 3314 | 397 overwrite None partial False |
| 398 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f | |
|
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
399 b: local moved to a -> m |
| 3252 | 400 rev: versions differ -> m |
| 401 c: remote created -> g | |
|
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
402 merging b and a |
| 3314 | 403 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 |
| 3252 | 404 getting c |
| 405 merging rev | |
| 3314 | 406 my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337 |
| 3252 | 407 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 408 (branch merge, don't forget to commit) | |
| 409 -------------- | |
| 410 M b | |
|
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
411 a |
| 3252 | 412 M c |
| 413 -------------- | |
| 414 |