运行`hg histedit`时如何在命令行上指示合并工具

编程问答 2022-07-26

问题描述

在运行hg histedit时如何在命令行上指示合并工具？似乎不像--tool和hg merge那样支持hg rebase标志。

解决方法

一些处理合并冲突的命令似乎没有--tool选项。我们可能应该解决这个问题。

同时，您可以将--config ui.merge=studgeeks_preferred_merge_tool用作任何命令的全局选项，以使用您喜欢的任何合并工具。

,
  1. 没事
  2. Histedit不会以hg-terms合并，而是将顺序更改合并为一个（如果需要，请折叠后）

想象一下这样的测试仓库历史记录

#Data 1
ts1 <- structure(list(Time = c("08:00:00","08:00:10","08:00:20","08:00:30","08:00:40","08:00:50"),f1 = c(-0.018,-0.016,-0.014,-0.016),f2 = c(-0.018,-0.02,-0.018,-0.018),f3 = c(-0.024,-0.024,-0.022,-0.022
),f4 = c(-0.014,-0.013,-0.011,-0.015,-0.02),f5 = c(-0.009,-0.007,-0.009,-0.009),f6 = c(-0.012,-0.012,-0.012),f7 = c(-0.017,-0.017,-0.019,-0.017)),class = "data.frame",row.names = c(NA,-6L))

#Data 2
ts2 <- structure(list(Time = c("08:00:00",f1 = c(11489L,11495L,11409L,11441L,11413L,11434L),f2 = c(11651L,11709L,11721L,11729L,11764L,11785L),f3 = c(11587L,11595L,11493L,11602L,11590L,11580L
),f4 = c(13149.5,13206,13163,13303,13140,13300),f5 = c(12093L,12081L,12014L,11894L,12047L,12050L),f6 = c(12394L,12295L,12214L,12340L,12314L,12331L)),-6L))

我想在其中获得更多的“干净的历史记录”

第1步

加入r3和r4->hg log --style compact 7[tip] dd4d044125d6 2020-09-23 18:58 +0500 lazybadger Renaming 6 1c11e58879be 2020-09-23 18:56 +0500 lazybadger Expanding b 5 4eecc2e00de0 2020-09-23 18:54 +0500 lazybadger Fix casing in a 4 c4fb7f8f9d6a 2020-09-23 18:53 +0500 lazybadger End of replacing nums by words in a 3 f153e48d474b 2020-09-23 18:53 +0500 lazybadger Start of replacing nums by words in a 2 020cf4853caf 2020-09-23 18:50 +0500 lazybadger Added file b 1 1cbe55623ca6 2020-09-23 18:48 +0500 lazybadger Added string to a 0 2248df06d3de 2020-09-23 18:47 +0500 lazybadger initial commit 

hg histedit f153

结果

mess f153e48d474b 3 Replacing nums by words in a
fold c4fb7f8f9d6a 4 End of replacing nums by words in a
pick 4eecc2e00de0 5 Fix casing in a
pick 1c11e58879be 6 Expanding b
pick dd4d044125d6 7 Renaming

汇总差异（抱歉俄罗斯日期，我懒得更改它）

>hg log --style compact
6[tip]   4cc2af840d4c   2020-09-23 18:58 +0500   lazybadger
  Renaming

5   ad1f49e75863   2020-09-23 18:56 +0500   lazybadger
  Expanding b

4   6a1e1cfb767a   2020-09-23 18:54 +0500   lazybadger
  Fix casing in a

3   089e21dda924   2020-09-23 18:53 +0500   lazybadger
  Replacing nums by words in a

2   020cf4853caf   2020-09-23 18:50 +0500   lazybadger
  Added file b

1   1cbe55623ca6   2020-09-23 18:48 +0500   lazybadger
  Added string to a

0   2248df06d3de   2020-09-23 18:47 +0500   lazybadger
  initial commit

第2步

如果我现在想加入（新）3和4，我将以>hg diff -c 3 diff -r 020cf4853caf -r 089e21dda924 a.txt --- a/a.txt Ср сен 23 18:50:50 2020 +0500 +++ b/a.txt Ср сен 23 18:53:43 2020 +0500 @@ -1,4 +1,4 @@ -Line 1 -Line 2 -Line 3 -Line 4 +Line one +Line two +Line three +Line four 的相同方式进行

>hg histedit 089e

结果

mess 089e21dda924 3 Replacing nums by words in a
roll 6a1e1cfb767a 4 Fix casing in a
pick ad1f49e75863 5 Expanding b
mess 4cc2af840d4c 6 Renaming

在流程中没有合并，因为我有源，一组更改，而不是两个具有不同历史记录的源

mercurial