与 Mercurial 合并时如何获取基础文件的变更集 ID？

Question

我有几个需要合并的分支，但我不知道合并工具中显示的一些更改来自哪里。 local 和 other 的变更集很明显，但是我如何找出基础文件来自哪个变更集？我正在一个有数十个分支的存储库中工作，因此查看图表并跟踪它效果不太好。

Answer 1

使用 revsets （Mercurial 1.6 及更高版本），您可以获得共同祖先两个变更集：

hg log -r ancestor(rev1,rev2)

Answer 2

尝试使用 hg grep 命令：

hg grep [OPTION]... PATTERN [FILE]...

search for a pattern in specified files and revisions

    Search revisions of files for a regular expression.

    This command behaves differently than Unix grep. It only accepts
    Python/Perl regexps. It searches repository history, not the working
    directory. It always prints the revision number in which a match appears.

    By default, grep only prints output for the first revision of a file in
    which it finds a match. To get it to print every revision that contains a
    change in match status ("-" for a match that becomes a non-match, or "+"
    for a non-match that becomes a match), use the --all flag.

    Returns 0 if a match is found, 1 otherwise.

options:

 -0 --print0               end fields with NUL
    --all                  print all revisions that match
 -f --follow               follow changeset history, or file history across
                           copies and renames
 -i --ignore-case          ignore case when matching
 -l --files-with-matches   print only filenames and revisions that match
 -n --line-number          print matching line numbers
 -r --rev REV [+]          only search files changed within revision range
 -u --user                 list the author (long with -v)
 -d --date                 list the date (short with -q)
 -I --include PATTERN [+]  include names matching the given patterns
 -X --exclude PATTERN [+]  exclude names matching the given patterns
    --mq                   operate on patch repository

[+] marked option can be specified multiple times

use "hg -v help grep" to show global options

您可以像这样使用它：

hg grep "a string"

它会告诉您它是在哪个版本中首次添加的。

如果您正在寻找较少搜索和更多概述的内容，您可以使用 hg log -v 来查看每个变更集中哪些文件发生了更改，并使用 hg log -p 来查看哪些文件在每个变更集中发生了更改> 查看每个的实际差异。