Skip to main content

Browse the archive

Staging
v0.5.1
https://foss.heptapod.net/mercurial/hgview
21 February 2024, 22:58:43 UTC
Revision 2e63c7ecc01a32ffab94ce68d193ad56b8f25695 authored by Graziella Toutoungis on 25 February 2009, 10:51:07 UTC, committed by Graziella Toutoungis on 25 February 2009, 10:51:07 UTC 
diff  concern the node who have two parents and produce a  conflict  while merging.
1 parent a16f6d0
Raw File
Tip revision: 2e63c7ecc01a32ffab94ce68d193ad56b8f25695 authored by Graziella Toutoungis on 25 February 2009, 10:51:07 UTC
diff concern the node who have two parents and produce a conflict while merging.
Tip revision: 2e63c7e
TODO 
===========
 TODO list
===========

temporary TODO list::

- manage group of users and save config in ``$HOME/.hgviewrc`` or
  ``$HGDIR/.hgviewrc``.

  - assign a color to each group instead of each user/email.

- diff for merges currently takes only the first parent.

- investigate how to speed up for large repo (ie. linux kernel).

- highlight search string in the lists (revision and file lists).



The 3-way diff algorithm in hgk.

find gca of the parents of the merge revision (uses hg debug-merge-base).

get tree diff (hg debug-diff-tree -r).
back to top