Issue 41: on merge commits, you only see file list from one parent http://bitbucket.org/tortoisehg/stable/issue/41/on-merge-commits-you-only-see-file-list-from-one
Steve Borho / sborho on Sun, 1 Mar 2009 06:20:04 +0100: Comment: I take it back, it's more complicated than I thought. You must query the diffs from both parents and then merge them because there can be duplicates with different states (the file may have been modified in one parent and deleted in another). We may need an 'other parent' toggle button for the commit dialog for this case. Changes: status: new -> open version: 0.7 -> 0.8 -- This is an issue notification from bitbucket.org. You are receiving this either because you are the owner of the issue, or you are following the issue. ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
