Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 12383:f1e8d6f6e682
merge with stable
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 23 Sep 2010 01:59:02 +0200 |
| parents | 6f0d9d79111f 28ddf67198b2 |
| children | 8eedf53547b8 |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Sep 22 18:29:41 2010 -0500 +++ b/mercurial/commands.py Thu Sep 23 01:59:02 2010 +0200 @@ -2502,7 +2502,11 @@ revmatchfn = None if opts.get('patch') or opts.get('stat'): - revmatchfn = cmdutil.match(repo, fns, default='path') + if opts.get('follow') or opts.get('follow_first'): + # note: this might be wrong when following through merges + revmatchfn = cmdutil.match(repo, fns, default='path') + else: + revmatchfn = matchfn displayer.show(ctx, copies=copies, matchfn=revmatchfn)