Changeset 9837b9bcfef1…
Parent 6778e0358ddf…
by
Changes to one file · Browse files at 9837b9bcfef1 Showing diff from parent 6778e0358ddf Diff from another changeset...
@@ -874,7 +874,12 @@ ui.debug('--update and --rebase are not compatible, ignoring '
'the update flag\n')
del opts['rebase']
- cmdutil.bail_if_changed(repo)
+ try:
+ # Mercurial >= 1.9
+ cmdutil.bailifchanged(repo)
+ except AttributeError:
+ # Mercurial <= 1.8
+ cmdutil.bail_if_changed(repo)
revsprepull = len(repo)
origpostincoming = commands.postincoming
def _dummy(*args, **kwargs):
|
Loading...