diff --git a/eden/scm/sapling/ext/tweakdefaults.py b/eden/scm/sapling/ext/tweakdefaults.py index 459a646f90..ab8fd58010 100644 --- a/eden/scm/sapling/ext/tweakdefaults.py +++ b/eden/scm/sapling/ext/tweakdefaults.py @@ -360,7 +360,7 @@ def pull(orig, ui, repo, *args, **opts): rebasemodule.rebase, ui, repo, dest=dest, tool=tool ) if dest and update: - ret = ret or commands.update(ui, repo, node=dest, check=True) + ret = ret or commands.update(ui, repo, node=dest) return ret diff --git a/eden/scm/tests/test-fb-ext-tweakdefaults-pull.t b/eden/scm/tests/test-fb-ext-tweakdefaults-pull.t index 28a5ef65d8..f3fe96ebd2 100644 --- a/eden/scm/tests/test-fb-ext-tweakdefaults-pull.t +++ b/eden/scm/tests/test-fb-ext-tweakdefaults-pull.t @@ -25,12 +25,11 @@ setup server and client pulling from $TESTTMP/a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -test a local modification (tofix: 'pull -u' should succeed ) +test a local modification $ echo aa > a $ hg pull -u -B main pulling from $TESTTMP/a - abort: uncommitted changes - [255] + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg st M a