mercurial/merge.py
changeset 44270 f546d2170b0f
parent 44215 b1069b369d6e
child 44271 c791ed6a2154
equal deleted inserted replaced
44269:48a1a974a92c 44270:f546d2170b0f
  2595             b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
  2595             b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
  2596         )
  2596         )
  2597     return stats
  2597     return stats
  2598 
  2598 
  2599 
  2599 
       
  2600 def clean_update(ctx, wc=None):
       
  2601     """Do a clean update to the given commit.
       
  2602 
       
  2603     This involves updating to the commit and discarding any changes in the
       
  2604     working copy.
       
  2605     """
       
  2606     return update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc)
       
  2607 
       
  2608 
  2600 def graft(
  2609 def graft(
  2601     repo,
  2610     repo,
  2602     ctx,
  2611     ctx,
  2603     base=None,
  2612     base=None,
  2604     labels=None,
  2613     labels=None,