Modify ↓
Opened 12 years ago
Closed 10 years ago
#10740 closed defect (fixed)
git merges are much too noisy
| Reported by: | Christian Boos | Owned by: | Jun Omae |
|---|---|---|---|
| Priority: | normal | Milestone: | 1.0.3 |
| Component: | version control/changeset view | Version: | 0.13dev |
| Severity: | critical | Keywords: | git merge |
| Cc: | leho@…, Jun Omae | Branch: | |
| Release Notes: |
Show the differences against the first parent for a merge commit rather than merged differences against its parents. |
||
| API Changes: | |||
| Internal Changes: | |||
Description
The recent ![20fc725] merge shows an awfully long list of changes.
From the command-line, it looks quite simple:
$ git show jomae/ticket10678/trunk --stat
commit 20fc725976eda7407ff97ab4ec5f2a1fe8ee2ce8
Merge: 04fa11b a219b21
Author: Jun Omae <jun66j5@gmail.com>
Date: Mon Jun 25 22:49:23 2012 +0900
ticket:10678, merged from repos:jomae.git:ticket10678/0.12-stable
trac/ticket/report.py | 3 +-
trac/ticket/tests/wikisyntax.py | 26 ++++++++++++++++++++++++
trac/util/__init__.py | 2 +-
trac/versioncontrol/web_ui/changeset.py | 4 +-
trac/versioncontrol/web_ui/tests/wikisyntax.py | 21 ++++++++++++++++++-
trac/wiki/api.py | 2 +-
trac/wiki/parser.py | 2 +-
trac/wiki/tests/wiki-tests.txt | 15 +++++++++++++
trac/wiki/tests/wikisyntax.py | 13 ++++++++++++
9 files changed, 81 insertions(+), 7 deletions(-)
However, what the corresponding Trac changeset shows (don't look! trust me ;-) ) is more like this:
$ git diff --stat 20fc7259^1 20fc7259 trac/ticket/report.py | 3 +- trac/ticket/tests/wikisyntax.py | 26 ++++++++++++++++++++++++ trac/util/__init__.py | 2 +- trac/versioncontrol/web_ui/changeset.py | 4 +- trac/versioncontrol/web_ui/tests/wikisyntax.py | 21 ++++++++++++++++++- trac/wiki/api.py | 2 +- trac/wiki/parser.py | 2 +- trac/wiki/tests/wiki-tests.txt | 15 +++++++++++++ trac/wiki/tests/wikisyntax.py | 13 ++++++++++++ 9 files changed, 81 insertions(+), 7 deletions(-) $ git diff --stat 20fc7259^2 20fc7259 .gitignore | 3 + .tx/config | 10 +- AUTHORS | 1 + ChangeLog | 1 - INSTALL | 129 +- Makefile | 203 +- Makefile.cfg.sample | 8 +- RELEASE | 41 +- TESTING-README | 102 +- THANKS | 14 +- UPGRADE | 226 +- cgi-bin/trac.cgi | 37 - cgi-bin/trac.fcgi | 35 - contrib/bugzilla2trac.py | 191 +- contrib/cgi-bin/trac.cgi | 37 + contrib/cgi-bin/trac.fcgi | 35 + contrib/checkwiki.py | 3 +- contrib/htdigest.py | 10 +- contrib/migrateticketmodel.py | 21 +- contrib/sourceforge2trac.py | 247 +- contrib/workflow/migrate_original_to_basic.py | 8 +- doc/Makefile | 74 - doc/README | 2 +- doc/admin/command_line.rst | 1 - doc/admin/environment.rst | 7 - doc/admin/ini.rst | 5 - doc/admin/permissions.rst | 1 - doc/api/env.rst | 9 - doc/api/index.rst | 10 + doc/api/trac_attachment.rst | 43 + doc/api/trac_cache.rst | 50 + doc/api/trac_core.rst | 134 + doc/api/trac_env.rst | 30 + doc/api/trac_mimeview.rst | 50 + doc/api/trac_ticket_roadmap.rst | 49 + doc/api/trac_util.rst | 86 + doc/api/trac_util_datefmt.rst | 79 + doc/api/trac_util_html.rst | 38 + doc/api/trac_util_presentation.rst | 14 + doc/api/trac_util_text.rst | 111 + doc/api/trac_versioncontrol_api.rst | 55 + doc/api/trac_versioncontrol_diff.rst | 42 + doc/api/trac_versioncontrol_svn_fs.rst | 37 + doc/api/trac_web_api.rst | 56 + doc/api/trac_web_auth.rst | 31 + doc/api/trac_web_chrome.rst | 50 + doc/api/trac_web_href.rst | 9 + doc/api/trac_web_main.rst | 30 + doc/api/trac_wiki_api.rst | 56 + doc/api/tracopt_mimeview.rst | 36 + doc/conf.py | 241 ++- doc/contents.rst | 9 - doc/dev/testing-core.rst | 27 +- doc/dev/testing-database.rst | 57 +- doc/dev/testing-environment.rst | 3 + doc/dev/testing-intro.rst | 121 + doc/dev/testing-plugins.rst | 32 +- doc/dev/testing.rst | 115 +- doc/glossary.rst | 9 + doc/images/bkgnd_pattern.png | Bin 0 -> 112 bytes doc/images/trac_logo.png | Bin 0 -> 6302 bytes doc/images/vertbars.png | Bin 0 -> 270 bytes doc/index.rst | 40 +- doc/install/apacheauth.rst | 181 - doc/install/cgi.rst | 40 - doc/install/fastcgi.rst | 219 -- doc/install/index.rst | 237 -- doc/install/mod_python.rst | 252 -- doc/install/subversion.rst | 11 - doc/todo.rst | 4 + doc/trac_icon_16x16.png | Bin 453 -> 0 bytes doc/trac_icon_32x32.png | Bin 683 -> 0 bytes doc/trac_logo.png | Bin 3465 -> 0 bytes doc/trac_logo.svg | 105 - doc/utils/epydoc.conf | 153 + doc/utils/epydoc.css | 136 + doc/utils/runepydoc.py | 55 + doc/utils/trac_dev_pdf.style | 52 + doc/utils/tracsphinx.css | 155 + sample-plugins/HelloWorld.py | 3 +- sample-plugins/Timestamp.py | 2 +- .../permissions/vulnerability_tickets.py | 10 +- sample-plugins/ticket_clone.py | 51 - sample-plugins/workflow/CodeReview.py | 11 +- sample-plugins/workflow/DeleteTicket.py | 7 +- sample-plugins/workflow/StatusFixer.py | 20 +- sample-plugins/workflow/VoteOperation.py | 8 +- setup.cfg | 25 +- setup.py | 28 +- trac/__init__.py | 2 +- trac/admin/console.py | 18 +- trac/admin/templates/admin.html | 4 +- trac/admin/templates/admin_basics.html | 29 +- trac/admin/templates/admin_enums.html | 6 +- trac/admin/templates/admin_perms.html | 150 +- trac/admin/templates/admin_plugins.html | 12 +- trac/admin/tests/console-tests.txt | 207 +- trac/admin/tests/console.py | 196 +- trac/admin/web_ui.py | 75 +- trac/attachment.py | 605 ++-- trac/cache.py | 321 ++- trac/config.py | 120 +- trac/core.py | 120 +- trac/db/api.py | 164 +- trac/db/mysql_backend.py | 68 +- trac/db/pool.py | 60 +- trac/db/postgres_backend.py | 14 +- trac/db/sqlite_backend.py | 33 +- trac/db/tests/api.py | 120 +- trac/db/util.py | 59 +- trac/db_default.py | 67 +- trac/dist.py | 218 ++- trac/env.py | 572 ++-- trac/htdocs/README | 2 +- trac/htdocs/batchmodify.png | Bin 0 -> 1243 bytes trac/htdocs/css/about.css | 4 +- trac/htdocs/css/admin.css | 9 +- trac/htdocs/css/browser.css | 81 +- trac/htdocs/css/jquery-ui-addons.css | 12 + .../ui-bg_diagonals-thick_18_ffddcc_40x40.png | Bin 0 -> 362 bytes .../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 0 -> 251 bytes .../images/ui-bg_flat_00_ffffff_40x100.png | Bin 0 -> 178 bytes .../images/ui-bg_flat_0_ffffdd_40x100.png | Bin 0 -> 180 bytes .../images/ui-bg_flat_0_ffffff_40x100.png | Bin 0 -> 178 bytes .../images/ui-bg_flat_10_000000_40x100.png | Bin 0 -> 178 bytes .../ui-bg_highlight-soft_30_303030_1x100.png | Bin 0 -> 116 bytes .../ui-bg_highlight-soft_75_c0f0c0_1x100.png | Bin 0 -> 119 bytes .../ui-bg_highlight-soft_80_ffffdd_1x100.png | Bin 0 -> 113 bytes .../jquery-ui/images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes .../jquery-ui/images/ui-icons_4b954f_256x240.png | Bin 0 -> 4369 bytes .../jquery-ui/images/ui-icons_505050_256x240.png | Bin 0 -> 5355 bytes .../jquery-ui/images/ui-icons_707070_256x240.png | Bin 0 -> 5355 bytes .../jquery-ui/images/ui-icons_9b081d_256x240.png | Bin 0 -> 5355 bytes .../jquery-ui/images/ui-icons_b00000_256x240.png | Bin 0 -> 5355 bytes .../jquery-ui/images/ui-icons_d7d7d7_256x240.png | Bin 0 -> 5355 bytes trac/htdocs/css/jquery-ui/jquery-ui.css | 565 +++ trac/htdocs/css/report.css | 89 +- trac/htdocs/css/roadmap.css | 41 +- trac/htdocs/css/ticket.css | 48 +- trac/htdocs/css/timeline.css | 28 +- trac/htdocs/css/trac.css | 82 +- trac/htdocs/css/wiki.css | 17 + trac/htdocs/inreply.png | Bin 0 -> 347 bytes trac/htdocs/js/auto_preview.js | 100 +- trac/htdocs/js/babel.js | 39 +- trac/htdocs/js/blame.js | 2 +- trac/htdocs/js/excanvas.js | 48 + trac/htdocs/js/expand_dir.js | 4 +- trac/htdocs/js/folding.js | 6 +- trac/htdocs/js/ie_pre7_hacks.js | 7 - trac/htdocs/js/jquery-ui-addons.js | 12 + trac/htdocs/js/jquery-ui-i18n.js | 49 + trac/htdocs/js/jquery-ui.js | 356 ++ trac/htdocs/js/jquery.js | 171 +- trac/htdocs/js/log_graph.js | 44 + trac/htdocs/js/query.js | 336 ++- trac/htdocs/js/search.js | 36 +- trac/htdocs/js/suggest.js | 8 +- trac/htdocs/js/threaded_comments.js | 100 + trac/htdocs/js/workflow_graph.js | 254 ++ trac/locale/ca/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/cs/LC_MESSAGES/tracini.po | 1366 ++++++++ trac/locale/de/LC_MESSAGES/messages-js.po | 12 +- trac/locale/de/LC_MESSAGES/messages.po | 2515 +++++++++------ trac/locale/de/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/el/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/en_GB/LC_MESSAGES/messages-js.po | 16 +- trac/locale/en_GB/LC_MESSAGES/messages.po | 3187 ++++++++++++------ trac/locale/en_GB/LC_MESSAGES/tracini.po | 2113 ++++++++++++ trac/locale/en_US/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/eo/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/es/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/es_AR/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/fa/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/fi/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/fr/LC_MESSAGES/messages-js.po | 14 +- trac/locale/fr/LC_MESSAGES/messages.po | 2848 ++++++++++------ trac/locale/fr/LC_MESSAGES/tracini.po | 1408 ++++++++ trac/locale/gl/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/he/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/hu/LC_MESSAGES/messages-js.po | 18 +- trac/locale/hu/LC_MESSAGES/messages.po | 3005 +++++++++++------ trac/locale/hu/LC_MESSAGES/tracini.po | 1495 ++++++++ trac/locale/hy/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/it/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/ja/LC_MESSAGES/messages-js.po | 92 +- trac/locale/ja/LC_MESSAGES/messages.po | 3122 +++++++++++------ trac/locale/ja/LC_MESSAGES/tracini.po | 1408 ++++++++ trac/locale/ko/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/messages-js.pot | 16 +- trac/locale/messages.pot | 2770 ++++++++++------ trac/locale/nb/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/nl/LC_MESSAGES/messages-js.po | 39 +- trac/locale/nl/LC_MESSAGES/messages.po | 1643 ++++----- trac/locale/nl/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/pl/LC_MESSAGES/tracini.po | 1366 ++++++++ trac/locale/pt/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/pt_BR/LC_MESSAGES/messages.po | 3343 +++++++++++++------ trac/locale/pt_BR/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/ro/LC_MESSAGES/tracini.po | 1366 ++++++++ trac/locale/ru/LC_MESSAGES/messages-js.po | 10 +- trac/locale/ru/LC_MESSAGES/messages.po | 656 ++-- trac/locale/ru/LC_MESSAGES/tracini.po | 1366 ++++++++ trac/locale/sl/LC_MESSAGES/tracini.po | 1366 ++++++++ trac/locale/sv/LC_MESSAGES/messages-js.po | 98 +- trac/locale/sv/LC_MESSAGES/messages.po | 3590 +++++++++++++------- trac/locale/sv/LC_MESSAGES/tracini.po | 2182 ++++++++++++ trac/locale/tr/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/tracini.pot | 1408 ++++++++ trac/locale/vi/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/zh_CN/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/locale/zh_TW/LC_MESSAGES/messages-js.po | 10 +- trac/locale/zh_TW/LC_MESSAGES/messages.po | 712 ++-- trac/locale/zh_TW/LC_MESSAGES/tracini.po | 1365 ++++++++ trac/log.py | 4 - trac/mimeview/api.py | 210 +- trac/mimeview/patch.py | 7 +- trac/mimeview/pygments.py | 2 +- trac/mimeview/rst.py | 29 +- trac/mimeview/silvercity.py | 161 - trac/mimeview/tests/api.py | 11 +- trac/mimeview/tests/patch.py | 12 +- trac/mimeview/tests/pygments.py | 8 +- trac/notification.py | 74 +- trac/perm.py | 296 +- trac/prefs/templates/prefs.html | 4 +- trac/prefs/templates/prefs_datetime.html | 44 +- trac/prefs/templates/prefs_language.html | 24 +- trac/prefs/web_ui.py | 21 +- trac/resource.py | 8 +- trac/search/templates/search.html | 7 +- trac/search/web_ui.py | 13 +- trac/templates/README | 21 +- trac/templates/about.html | 36 +- trac/templates/attachment.html | 8 +- trac/templates/author_or_creator.rss | 2 +- trac/templates/diff_div.html | 28 +- trac/templates/diff_view.html | 2 +- trac/templates/error.html | 14 +- trac/templates/footer.cs | 34 - trac/templates/header.cs | 71 - trac/templates/history_view.html | 10 +- trac/templates/layout.html | 19 +- trac/templates/list_of_attachments.html | 32 +- trac/templates/macros.cs | 197 -- trac/templates/progress_bar.html | 36 +- trac/templates/progress_bar_grouped.html | 36 + trac/templates/theme.html | 10 +- trac/test.py | 292 +- trac/tests/attachment.py | 72 +- trac/tests/config.py | 17 +- trac/tests/contentgen.py | 2 +- trac/tests/env.py | 26 +- trac/tests/functional/__init__.py | 2 +- trac/tests/functional/better_twill.py | 15 + trac/tests/functional/testenv.py | 31 +- trac/tests/functional/tester.py | 6 +- trac/tests/notification.py | 5 +- trac/tests/perm.py | 72 +- trac/tests/wikisyntax.py | 8 +- trac/ticket/admin.py | 298 +- trac/ticket/api.py | 72 +- trac/ticket/batch.py | 205 ++ trac/ticket/default_workflow.py | 101 +- trac/ticket/model.py | 1008 +++--- trac/ticket/notification.py | 206 +- trac/ticket/query.py | 343 ++- trac/ticket/report.py | 252 +- trac/ticket/roadmap.py | 478 ++-- trac/ticket/templates/batch_modify.html | 62 + .../ticket/templates/batch_ticket_notify_email.txt | 17 + trac/ticket/templates/milestone_edit.html | 2 + trac/ticket/templates/milestone_view.html | 29 +- trac/ticket/templates/query.html | 55 +- trac/ticket/templates/query.rss | 2 +- trac/ticket/templates/query_results.html | 28 +- trac/ticket/templates/report.rss | 4 +- trac/ticket/templates/report_edit.html | 2 +- trac/ticket/templates/report_list.html | 110 +- trac/ticket/templates/report_view.html | 29 +- trac/ticket/templates/roadmap.html | 4 +- trac/ticket/templates/ticket.html | 246 +- trac/ticket/templates/ticket_box.html | 22 +- trac/ticket/templates/ticket_change.html | 126 +- trac/ticket/templates/ticket_notify_email.txt | 2 +- trac/ticket/templates/ticket_preview.html | 22 + trac/ticket/tests/__init__.py | 3 +- trac/ticket/tests/batch.py | 256 ++ trac/ticket/tests/conversion.py | 6 +- trac/ticket/tests/functional.py | 251 ++- trac/ticket/tests/model.py | 194 +- trac/ticket/tests/notification.py | 81 +- trac/ticket/tests/query.py | 56 +- trac/ticket/tests/report.py | 14 +- trac/ticket/tests/wikisyntax.py | 11 +- trac/ticket/web_ui.py | 445 ++- trac/timeline/api.py | 2 +- trac/timeline/templates/timeline.html | 11 +- trac/timeline/web_ui.py | 103 +- trac/upgrades/db15.py | 12 +- trac/upgrades/db18.py | 35 +- trac/upgrades/db21.py | 8 +- trac/upgrades/db25.py | 10 +- trac/upgrades/db27.py | 15 + trac/util/__init__.py | 233 +- trac/util/autoreload.py | 29 +- trac/util/compat.py | 63 +- trac/util/daemon.py | 12 +- trac/util/datefmt.py | 447 +++- trac/util/html.py | 85 +- trac/util/presentation.py | 4 + trac/util/tests/__init__.py | 53 +- trac/util/tests/datefmt.py | 476 +++ trac/util/tests/html.py | 49 +- trac/util/tests/text.py | 18 +- trac/util/text.py | 120 +- trac/util/translation.py | 42 +- trac/versioncontrol/admin.py | 10 +- trac/versioncontrol/api.py | 275 +- trac/versioncontrol/cache.py | 277 +- trac/versioncontrol/diff.py | 241 +- trac/versioncontrol/svn_authz.py | 9 +- trac/versioncontrol/svn_fs.py | 1009 +------ trac/versioncontrol/svn_prop.py | 356 +-- .../templates/admin_repositories.html | 2 +- trac/versioncontrol/templates/browser.html | 76 +- trac/versioncontrol/templates/changeset.html | 18 +- trac/versioncontrol/templates/dir_entries.html | 64 +- trac/versioncontrol/templates/path_links.html | 24 +- .../versioncontrol/templates/repository_index.html | 24 +- trac/versioncontrol/templates/revisionlog.html | 34 +- trac/versioncontrol/templates/revisionlog.rss | 2 +- trac/versioncontrol/templates/revisionlog.txt | 5 +- trac/versioncontrol/templates/sortable_th.html | 9 +- trac/versioncontrol/tests/__init__.py | 3 +- trac/versioncontrol/tests/cache.py | 151 +- trac/versioncontrol/tests/diff.py | 156 +- trac/versioncontrol/tests/functional.py | 5 +- trac/versioncontrol/tests/svn_fs.py | 915 ----- trac/versioncontrol/tests/svnrepos.dump | 748 ---- trac/versioncontrol/web_ui/browser.py | 151 +- trac/versioncontrol/web_ui/changeset.py | 131 +- trac/versioncontrol/web_ui/log.py | 54 +- trac/versioncontrol/web_ui/tests/wikisyntax.py | 59 +- trac/versioncontrol/web_ui/util.py | 98 +- trac/web/api.py | 240 +- trac/web/auth.py | 194 +- trac/web/chrome.py | 409 ++- trac/web/clearsilver.py | 369 -- trac/web/href.py | 16 +- trac/web/main.py | 302 +- trac/web/modpython_frontend.py | 7 +- trac/web/session.py | 262 +- trac/web/standalone.py | 74 +- trac/web/tests/__init__.py | 8 - trac/web/tests/auth.py | 94 +- trac/web/tests/chrome.py | 14 +- trac/web/tests/clearsilver.py | 18 - trac/web/tests/href.py | 10 +- trac/web/tests/htpasswd.txt | 4 + trac/web/tests/session.py | 544 ++-- trac/wiki/admin.py | 125 +- trac/wiki/api.py | 216 +- trac/wiki/default-pages/TracBatchModify | 10 + trac/wiki/default-pages/TracGuide | 1 + trac/wiki/default-pages/TracInstall | 2 +- trac/wiki/default-pages/TracTicketsCustomFields | 6 +- trac/wiki/default-pages/WikiStart | 2 +- trac/wiki/formatter.py | 232 +- trac/wiki/intertrac.py | 54 +- trac/wiki/interwiki.py | 40 +- trac/wiki/macros.py | 201 +- trac/wiki/model.py | 109 +- trac/wiki/parser.py | 33 +- trac/wiki/templates/wiki_delete.html | 100 +- trac/wiki/templates/wiki_edit.html | 14 +- trac/wiki/templates/wiki_edit_form.html | 3 +- trac/wiki/templates/wiki_view.html | 38 +- trac/wiki/tests/__init__.py | 2 + trac/wiki/tests/formatter.py | 59 +- trac/wiki/tests/macros.py | 45 +- trac/wiki/tests/model.py | 122 +- trac/wiki/tests/wiki-tests.txt | 89 +- trac/wiki/tests/wikisyntax.py | 16 + trac/wiki/web_api.py | 12 +- trac/wiki/web_ui.py | 140 +- tracini.cfg | 7 + tracopt/mimeview/enscript.py | 4 +- tracopt/mimeview/php.py | 10 +- tracopt/mimeview/silvercity.py | 161 + tracopt/perm/authz_policy.py | 2 +- tracopt/perm/config_perm_provider.py | 2 +- tracopt/ticket/clone.py | 64 + tracopt/ticket/commit_updater.py | 22 +- tracopt/ticket/deleter.py | 29 +- tracopt/ticket/templates/ticket_delete.html | 16 +- tracopt/versioncontrol/git/PyGIT.py | 1042 ++++++ tracopt/versioncontrol/git/git_fs.py | 760 +++++ tracopt/versioncontrol/git/tests/PyGIT.py | 301 ++ tracopt/versioncontrol/git/tests/__init__.py | 26 + tracopt/versioncontrol/svn/svn_fs.py | 1087 ++++++ tracopt/versioncontrol/svn/svn_prop.py | 402 +++ tracopt/versioncontrol/svn/tests/__init__.py | 11 + tracopt/versioncontrol/svn/tests/svn_fs.py | 916 +++++ tracopt/versioncontrol/svn/tests/svnrepos.dump | 748 ++++ wiki-macros/README | 34 - 406 files changed, 86290 insertions(+), 22760 deletions(-)
(i.e. the concatenation of differences against each parent)
This is completely not useful and a waste of good CPU ;-)
Either we follow the git way (show the differences against the first parent) or the TracMercurial way (show only the files modified in both diffs).
Attachments (0)
Change History (6)
comment:1 by , 12 years ago
| Cc: | added |
|---|
comment:2 by , 11 years ago
| Cc: | added |
|---|
comment:3 by , 10 years ago
| Milestone: | next-stable-1.0.x → 1.0.3 |
|---|---|
| Owner: | changed from to |
| Status: | new → assigned |
comment:4 by , 10 years ago
Looks good and appropriate for git (… until we know how to show --cc diffs!).
Does that also work with root commits? (the parent None part).
comment:5 by , 10 years ago
Yeah, that works with a root commit as well. Added unit tests for a root commit in [d17e47b4/jomae.git].
comment:6 by , 10 years ago
| Release Notes: | modified (diff) |
|---|---|
| Resolution: | → fixed |
| Status: | assigned → closed |
Note:
See TracTickets
for help on using tickets.
Proposed changes in jomae.git@t10740. After the changes,
GitChangeset.get_changes()returns the differences against the first parent.