[allura:tickets] #5734 Fix handling of merge commits in diffs

[Dave Brondsema <br...@users.sf.net>]

- **summary**: Fix handling of merge commits --> Fix handling of merge commits in diffs



---

** [tickets:#5734] Fix handling of merge commits in diffs**

**Status:** open
**Labels:** scm 
**Created:** Fri Feb 01, 2013 07:36 PM UTC by Cory Johns
**Last Updated:** Fri Feb 01, 2013 09:19 PM UTC
**Owner:** nobody

Currently, diffs are computed by seeing if a tree / blob node is different in *any* of the parents of the commit.  Instead, the node should only be considered changed in the commit if it is different from the corresponding node in *all* of the parent commits.  (For a commit with a single parent, this amounts to the same thing.  But for merge commits, if the file was changed in one branch but was not touched in the other branch and there are thus no conflicts, then it wasn't really changed in the merge commit.)

This doesn't affect SVN, and probably doesn't affect Mercurial, due to the way they do branching, but Mercurial should be confirmed that it will behave well with this new logic.


---

Sent from sourceforge.net because allura-dev@incubator.apache.org is subscribed to https://sourceforge.net/p/allura/tickets/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/allura/admin/tickets/options.  Or, if this is a mailing list, you can unsubscribe from the mailing list.