hg log 'filename' not showing merges?

Matt Mackall mpm at selenic.com
Mon May 21 17:15:50 CDT 2007


On Mon, May 21, 2007 at 04:11:24PM -0300, Alexis S. L. Carvalho wrote:
> This is consistent with my theory above.

Good analysis.
 
> We should probably refuse to commit a merge if it doesn't touch all
> files in state "m" in the dirstate, either in localrepo.commit or in
> commands.commit (is there's a legitimate reason to create a commit like
> that?).

Yes, you're probably right here.

-- 
Mathematics is the supreme nostalgia of our time.


More information about the Mercurial mailing list