| Issue 10: | Offer side by side patch view for an n-way merge | |
| 25 people starred this issue and may be notified of changes. | Back to list |
Reported by Shawn Pearce <sop@google.com> on Tue Jan 13 10:30:36 PST 2009 Source: JIRA GERRIT-10 Affected Version: 2.0 In an n-way merge we should display a column for each base file, and a column for the final file. In a 2-way merge commit this would show 3 columns in the side-by-side patch display.
Sep 24, 2009
#1
code-rev...@gtempaccount.com
Labels:
-Priority-Major Priority-Minor
Sep 24, 2009
Comment by Christopher Tate <ctate@google.com> on Tue Jun 30 17:06:01 PDT 2009 In general, if unified diff display is available, side-by-side diff should also be available. The before-submitting-the-patch and after-submitting-the- patch states are well defined from Gerrit's point of view.
Sep 24, 2009
Comment by Shawn Pearce <sop@google.com> on Tue Jun 30 17:09:28 PDT 2009 When viewing a merge, against which before-submitting-the-patch state should we look at? commit^1 ? commit^2 ? commit^15 if its an octopus ?
Sep 24, 2009
Likely related to 194 where we want to support different diffs between patch sets, which is quit similar to diffs between parents.
Status:
Accepted
Owner: --- Blockedon: 194 |
|
| ► Sign in to add a comment |