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