Kiln » largefiles » largefiles-truncated
Clone URL:  

Fixed merging error.

Changeset abc68fca5421…

Parent ab29bcf938c9…

by David Golub

Changes to one file · Browse files at abc68fca5421 Showing diff from parent ab29bcf938c9 Diff from another changeset...

Change 1 of 1 Show Entire File kbfiles/​bfcommands.py Stacked
 
439
440
441
442
443
444
445
446
447
 
 
 
 
 
 
448
449
450
 
439
440
441
 
 
 
 
 
 
442
443
444
445
446
447
448
449
450
@@ -439,12 +439,12 @@
  elif state == 'a':   bfdirstate.add(bfile)   elif state == '?': - try: - # Mercurial >= 1.9 - bfdirstate.drop(bfile) - except AttributeError: - # Mercurial <= 1.8 - bfdirstate.forget(bfile) + try: + # Mercurial >= 1.9 + bfdirstate.drop(bfile) + except AttributeError: + # Mercurial <= 1.8 + bfdirstate.forget(bfile)   bfdirstate.write()   finally:   wlock.release()