Project

General

Profile

Actions
Copy link

Defect #7518

closed

Mercurial diff can be wrong if the previous changeset isn't the parent

Added by Toshi MARUYAMA almost 14 years ago. Updated almost 14 years ago.

Status:
Closed
Priority:
Normal
Assignee:
Toshi MARUYAMA
Category:
SCM
Target version:
1.2.0
Start date:
2011-02-02
Due date:
% Done:

0%

Estimated time:
Resolution:
Fixed
Affected version:

Description

Mercurial is DAG-based DVCS.

Before r4662, Redmine runs "hg diff -r 4661 -r 4662" for http://www.redmine.org/projects/redmine/repository/revisions/4662/diff .
If r4661 is not parent of r4662, diff is wrong.

This is TortoiseHg 1.9 image of Redmine 1.1 Mercurial test repository.

Parent of revision 16 is revision 6.

Files

thg-graph.png (24.9 KB) thg-graph.png Toshi MARUYAMA, 2011-02-02 05:08

Related issues

Related to Redmine - Defect #3724: Mercurial repositories display revision ID instead of changeset IDClosedToshi MARUYAMA2009-08-10

Actions
Related to Redmine - Defect #7253: Test failures in MercurialAdapterTestClosedToshi MARUYAMA2011-01-09

Actions
Related to Redmine - Defect #8741: Git: diff is always empty in merged revsionClosed2011-07-03

Actions
Actions
Copy link
 #1

Updated by Toshi MARUYAMA almost 14 years ago

  • Target version deleted (1.2.0)
Actions
Copy link
 #2

Updated by Toshi MARUYAMA almost 14 years ago

  • Status changed from New to Closed
  • Target version set to 1.2.0
  • Resolution set to Fixed

Fixed by r4662 and r4854.

Mercurial can have two parents.
Diff for each parent is difficult in current Redmine interface.

Actions
Copy link

Also available in: Atom PDF