Patchwork [2,of,2,RFC] largefiles: remove bailifchanged check from overridepull (BC)

login
register
mail settings
Submitter Siddharth Agarwal
Date Sept. 20, 2013, 11:54 p.m.
Message ID <e663e78abfadeb2fa342.1379721260@dev1091.prn1.facebook.com>
Download mbox | patch
Permalink /patch/2587/
State Accepted
Commit 0c626b68c5c6ee753f81f2d541db62b385e1a9f9
Headers show

Comments

Siddharth Agarwal - Sept. 20, 2013, 11:54 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1379715990 25200
#      Fri Sep 20 15:26:30 2013 -0700
# Node ID e663e78abfadeb2fa342aceaf8a56580301da590
# Parent  a71c696cfb5d11a04e0fcef3507ca1f4764d2989
largefiles: remove bailifchanged check from overridepull (BC)

This brings pull --rebase with largefiles in line with pull --rebase without.
Matt Mackall - Sept. 23, 2013, 6:03 p.m.
On Fri, 2013-09-20 at 16:54 -0700, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1379715990 25200
> #      Fri Sep 20 15:26:30 2013 -0700
> # Node ID e663e78abfadeb2fa342aceaf8a56580301da590
> # Parent  a71c696cfb5d11a04e0fcef3507ca1f4764d2989
> largefiles: remove bailifchanged check from overridepull (BC)

These are queued for default, thanks.

Patch

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -717,7 +717,6 @@ 
                 ui.debug('--update and --rebase are not compatible, ignoring '
                          'the update flag\n')
             del opts['rebase']
-            cmdutil.bailifchanged(repo)
             origpostincoming = commands.postincoming
             def _dummy(*args, **kwargs):
                 pass