Submitter | Mads Kiilerich |
---|---|
Date | Feb. 25, 2014, 7:40 p.m. |
Message ID | <b0f2f46090caebdffabc.1393357228@mk-desktop> |
Download | mbox | patch |
Permalink | /patch/3767/ |
State | Superseded |
Commit | d9e211a658eb4fb17e1d951bcd9438d4b2c8ddb2 |
Headers | show |
Comments
Patch
diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -272,7 +272,7 @@ def mergecopies(repo, c1, c2, ca): if len(fl) == 2 and fl[0] == fl[1]: copy[fl[0]] = of # not actually divergent, just matching renames - if fullcopy: + if fullcopy and repo.ui.debugflag: repo.ui.debug(" all copies found (* = to merge, ! = divergent, " "% = renamed and deleted):\n") for f in sorted(fullcopy):