Project

General

Profile

Actions

Defect #8741

closed

Git: diff is always empty in merged revsion

Added by Dave Abrahams over 12 years ago. Updated over 8 years ago.

Status:
Closed
Priority:
Low
Assignee:
-
Category:
SCM
Target version:
-
Start date:
2011-07-03
Due date:
% Done:

0%

Estimated time:
Resolution:
Duplicate
Affected version:

Description

A URL of the form https://hub.boostpro.com/projects/embt/repository/revisions/a74df08c89e1120f82c79619b32d657adb1d04f5 gets me a screen with the commit message, but not even a list of files. I have to append /diff to the URL to even find out that Redmine has decided not to show that detail because it's so large.

By the way, is there a place I can adjust that limit?


Files

rev-url-short.diff (730 Bytes) rev-url-short.diff Toshi MARUYAMA, 2011-07-04 01:05
Screenshot-1.png (10.7 KB) Screenshot-1.png Toshi MARUYAMA, 2011-07-04 01:12
Screenshot.png (13 KB) Screenshot.png Toshi MARUYAMA, 2011-07-04 01:12

Related issues

Related to Redmine - Defect #7518: Mercurial diff can be wrong if the previous changeset isn't the parentClosedToshi MARUYAMA2011-02-02

Actions
Related to Redmine - Feature #3909: Mercurial: show repository graphic historyClosed2009-09-23

Actions
Is duplicate of Redmine - Defect #20693: GIT: No files/differences on git merge commit New

Actions
Actions #1

Updated by Toshi MARUYAMA over 12 years ago

  • Tracker changed from Defect to Feature
Actions #2

Updated by Toshi MARUYAMA over 12 years ago

  • Priority changed from Normal to Low
Actions #3

Updated by Toshi MARUYAMA over 12 years ago

Try this patch.

Actions #4

Updated by Toshi MARUYAMA over 12 years ago

  • Tracker changed from Feature to Defect
Actions #5

Updated by Toshi MARUYAMA over 12 years ago

Actions #6

Updated by Dave Abrahams over 12 years ago

  • Status changed from Closed to Reopened

I kept bumping those up until eventually the /diff URL stopped telling me that it was truncating the diffs, but still wouldn't show any diffs.

I think it's a defect (in both those pages) when you leave out information without explaining its absence. Just sayin'.

Actions #7

Updated by Toshi MARUYAMA over 12 years ago

  • Status changed from Reopened to Closed
  • Resolution deleted (Invalid)

Git is DAG. Git has many parents. If merge revision has no changes, diff is empty.
For example,
https://www.chiliproject.org/projects/chiliproject/repository/revisions/9ce7fd42308ef462a667525bfb81e7def06038cc

Actions #8

Updated by Toshi MARUYAMA over 12 years ago

  • Resolution set to Wont fix
Actions #9

Updated by Toshi MARUYAMA over 12 years ago

  • Subject changed from Revision detail silently truncated to Git: Revision detail silently truncated
Actions #10

Updated by Toshi MARUYAMA over 12 years ago

  • Subject changed from Git: Revision detail silently truncated to Git: diff detail silently truncated in merged revsion
Actions #11

Updated by Toshi MARUYAMA over 12 years ago

  • Status changed from Closed to Reopened
  • Resolution deleted (Wont fix)
Actions #12

Updated by Toshi MARUYAMA over 12 years ago

  • Subject changed from Git: diff detail silently truncated in merged revsion to Git: diff is empty in merged revsion
Actions #13

Updated by Toshi MARUYAMA over 12 years ago

  • Subject changed from Git: diff is empty in merged revsion to Git: diff is always empty in merged revsion
Actions #14

Updated by Dave Abrahams over 12 years ago

I believe the message from Redmine that the changes are too large to show conflicts with your theory that there are no changes to show.

Actions #15

Updated by Toshi MARUYAMA over 12 years ago

I can't see https://hub.boostpro.com/projects/embt/repository/revisions/a74df08c89e1 ,
because this site uses self certified ssl.

Actions #16

Updated by Dave Abrahams over 12 years ago

Toshi MARUYAMA wrote:

I can't see https://hub.boostpro.com/projects/embt/repository/revisions/a74df08c89e1 ,
because this site uses self certified ssl.

It's also password protected because it contains sensitive data, so even if you allowed the certificate, you wouldn't be able to see it. I'm doing my best with this bug report and if you would like some other kind of information, please tell me what it is.

Actions #17

Updated by Toshi MARUYAMA over 8 years ago

  • Status changed from Reopened to Closed
  • Resolution set to Duplicate

I close as duplicate of #20693.
This issue is not smart.

Actions #18

Updated by Toshi MARUYAMA over 8 years ago

  • Is duplicate of Defect #20693: GIT: No files/differences on git merge commit added
Actions

Also available in: Atom PDF