Mercurial > hg
changeset 22502:e6e7ef68c879
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 22 Sep 2014 16:14:08 -0500 |
| parents | bde49bbfb30f (current diff) abf4e98b8ff2 (diff) |
| children | c425b22a7ca5 |
| files | mercurial/commands.py mercurial/localrepo.py tests/test-changelog-exec.t |
| diffstat | 3 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Sep 22 16:03:07 2014 -0500 +++ b/mercurial/commands.py Mon Sep 22 16:14:08 2014 -0500 @@ -4278,9 +4278,8 @@ .. note:: for performance reasons, log FILE may omit duplicate changes - made on branches and will not show deletions. To see all - changes including duplicates and deletions, use the --removed - switch. + made on branches and will not show removals or mode changes. To + see all such changes, use the --removed switch. .. container:: verbose @@ -4335,6 +4334,7 @@ specifying custom templates. Returns 0 on success. + """ if opts.get('graph'): return cmdutil.graphlog(ui, repo, *pats, **opts)
--- a/mercurial/localrepo.py Mon Sep 22 16:03:07 2014 -0500 +++ b/mercurial/localrepo.py Mon Sep 22 16:14:08 2014 -0500 @@ -1126,7 +1126,7 @@ text = fctx.data() flog = self.file(fname) fparent1 = manifest1.get(fname, nullid) - fparent2 = fparent2o = manifest2.get(fname, nullid) + fparent2 = manifest2.get(fname, nullid) meta = {} copy = fctx.renamed() @@ -1192,9 +1192,8 @@ if fparent2 != nullid or flog.cmp(fparent1, text) or meta: changelist.append(fname) return flog.add(text, meta, tr, linkrev, fparent1, fparent2) - # are just the flags changed during merge? - if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): + elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): changelist.append(fname) return fparent1
--- a/tests/test-changelog-exec.t Mon Sep 22 16:03:07 2014 -0500 +++ b/tests/test-changelog-exec.t Mon Sep 22 16:14:08 2014 -0500 @@ -32,17 +32,19 @@ $ hg merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) + $ chmod +x foo $ hg ci -m 'merge' -this should not mention bar: +this should not mention bar but should mention foo: $ hg tip -v - changeset: 3:ef2fc9b4a51b + changeset: 3:c53d17ff3380 tag: tip parent: 2:ed1b79f46b9a parent: 1:d394a8db219b user: test date: Thu Jan 01 00:00:00 1970 +0000 + files: foo description: merge