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