comparison hgext/largefiles/overrides.py @ 19775:0c626b68c5c6

largefiles: remove bailifchanged check from overridepull (BC) This brings pull --rebase with largefiles in line with pull --rebase without.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 20 Sep 2013 15:26:30 -0700
parents 32e502b26983
children 9b088e9c2690
comparison
equal deleted inserted replaced
19774:7805cb8030e0 19775:0c626b68c5c6
715 if opts.get('update'): 715 if opts.get('update'):
716 del opts['update'] 716 del opts['update']
717 ui.debug('--update and --rebase are not compatible, ignoring ' 717 ui.debug('--update and --rebase are not compatible, ignoring '
718 'the update flag\n') 718 'the update flag\n')
719 del opts['rebase'] 719 del opts['rebase']
720 cmdutil.bailifchanged(repo)
721 origpostincoming = commands.postincoming 720 origpostincoming = commands.postincoming
722 def _dummy(*args, **kwargs): 721 def _dummy(*args, **kwargs):
723 pass 722 pass
724 commands.postincoming = _dummy 723 commands.postincoming = _dummy
725 try: 724 try: