equal
deleted
inserted
replaced
362 repo.dirstate.forget(f) |
362 repo.dirstate.forget(f) |
363 elif m == "e": # exec change |
363 elif m == "e": # exec change |
364 repo.dirstate.normallookup(f) |
364 repo.dirstate.normallookup(f) |
365 elif m == "g": # get |
365 elif m == "g": # get |
366 if branchmerge: |
366 if branchmerge: |
367 repo.dirstate.normaldirty(f) |
367 repo.dirstate.otherparent(f) |
368 else: |
368 else: |
369 repo.dirstate.normal(f) |
369 repo.dirstate.normal(f) |
370 elif m == "m": # merge |
370 elif m == "m": # merge |
371 f2, fd, flag, move = a[2:] |
371 f2, fd, flag, move = a[2:] |
372 if branchmerge: |
372 if branchmerge: |
505 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) |
505 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) |
506 |
506 |
507 stats = applyupdates(repo, action, wc, p2) |
507 stats = applyupdates(repo, action, wc, p2) |
508 |
508 |
509 if not partial: |
509 if not partial: |
|
510 repo.dirstate.setparents(fp1, fp2) |
510 recordupdates(repo, action, branchmerge) |
511 recordupdates(repo, action, branchmerge) |
511 repo.dirstate.setparents(fp1, fp2) |
|
512 if not branchmerge and not fastforward: |
512 if not branchmerge and not fastforward: |
513 repo.dirstate.setbranch(p2.branch()) |
513 repo.dirstate.setbranch(p2.branch()) |
514 finally: |
514 finally: |
515 wlock.release() |
515 wlock.release() |
516 |
516 |