# HG changeset patch # User Mads Kiilerich # Date 2016-01-17 18:29:27 # Node ID ee3123e19db9fd4d68c1932e09410b027c4535be # Parent 512a814c55956b0cddb0af4ec7cb6e1f925b55ab largefiles: make prompt order deterministic 42ae1b1f048f introduced iteration of a set. Make it stable. diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -470,7 +470,7 @@ def overridecalculateupdates(origfn, rep elif lfutil.standin(f) in p1: lfiles.add(f) - for lfile in lfiles: + for lfile in sorted(lfiles): standin = lfutil.standin(lfile) (lm, largs, lmsg) = actions.get(lfile, (None, None, None)) (sm, sargs, smsg) = actions.get(standin, (None, None, None))