equal
deleted
inserted
replaced
246 actions.append((file, None, message)) |
246 actions.append((file, None, message)) |
247 dropped.append(file) |
247 dropped.append(file) |
248 |
248 |
249 typeactions = mergemod.emptyactions() |
249 typeactions = mergemod.emptyactions() |
250 typeactions['r'] = actions |
250 typeactions['r'] = actions |
251 mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False) |
251 mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False, |
|
252 wantfiledata=False) |
252 |
253 |
253 # Fix dirstate |
254 # Fix dirstate |
254 for file in dropped: |
255 for file in dropped: |
255 dirstate.drop(file) |
256 dirstate.drop(file) |
256 |
257 |
380 actions.append((file, (fctx.flags(), False), message)) |
381 actions.append((file, (fctx.flags(), False), message)) |
381 |
382 |
382 typeactions = mergemod.emptyactions() |
383 typeactions = mergemod.emptyactions() |
383 typeactions['g'] = actions |
384 typeactions['g'] = actions |
384 mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], |
385 mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], |
385 False) |
386 False, wantfiledata=False) |
386 |
387 |
387 dirstate = repo.dirstate |
388 dirstate = repo.dirstate |
388 for file, flags, msg in actions: |
389 for file, flags, msg in actions: |
389 dirstate.normal(file) |
390 dirstate.normal(file) |
390 |
391 |
484 # Apply changes to disk |
485 # Apply changes to disk |
485 typeactions = mergemod.emptyactions() |
486 typeactions = mergemod.emptyactions() |
486 for f, (m, args, msg) in actions.iteritems(): |
487 for f, (m, args, msg) in actions.iteritems(): |
487 typeactions[m].append((f, args, msg)) |
488 typeactions[m].append((f, args, msg)) |
488 |
489 |
489 mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False) |
490 mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False, |
|
491 wantfiledata=False) |
490 |
492 |
491 # Fix dirstate |
493 # Fix dirstate |
492 for file in added: |
494 for file in added: |
493 dirstate.normal(file) |
495 dirstate.normal(file) |
494 |
496 |