Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 7631:0b2ee57dfdb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Tue, 13 Jan 2009 23:17:19 +0100
parents 4dd7b28003d2 a679bd371091
children 5bf5fd1e2a74
comparison
equal deleted inserted replaced
7629:97253bcb44a8 7631:0b2ee57dfdb1
368 else: 368 else:
369 repo.dirstate.forget(f) 369 repo.dirstate.forget(f)
370 elif m == "f": # forget 370 elif m == "f": # forget
371 repo.dirstate.forget(f) 371 repo.dirstate.forget(f)
372 elif m == "e": # exec change 372 elif m == "e": # exec change
373 repo.dirstate.normaldirty(f) 373 repo.dirstate.normallookup(f)
374 elif m == "g": # get 374 elif m == "g": # get
375 if branchmerge: 375 if branchmerge:
376 repo.dirstate.normaldirty(f) 376 repo.dirstate.normaldirty(f)
377 else: 377 else:
378 repo.dirstate.normal(f) 378 repo.dirstate.normal(f)