Submitter | phabricator |
---|---|
Date | Oct. 1, 2020, 2:09 p.m. |
Message ID | <differential-rev-PHID-DREV-ekhxuikuq5szz3a3lzpc-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47361/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -397,9 +397,9 @@ and dest in changes.salvaged ): minor[dest] = value - elif not isancestor(new_tt, other_tt): + elif changes is not None and dest in changes.merged: minor[dest] = value - elif changes is not None and dest in changes.merged: + elif not isancestor(new_tt, other_tt): minor[dest] = value