English 中文(简体)
我如何看待我为解决一场mer合的冲突而作何改变?
原标题:How do I see what I changed to resolve a mercurial merge conflict?

我刚刚把我们的维护部门的变化并入了我们的发展部门。 (我们用克隆技术处理汞存放处,而不是指定分支机构) 有一些冲突,因此,我不得不人工上调半个线,以解决合并的冲突。 无大事。 但是,当我看一看merge子时,我看一看整个编织物与一方或另一方交织,而不是合并冲突。

How can I review just the conflict and its resolution?

问题回答

象你这样的声音是:MergeDiff

hg -n annotate probably?

Or, better annotate -n .. | grep hg tip --template "{rev} " . You know changeset number of mergeset, your edits will have this number (automerged string will get number of latest change)

当我想这样做时,我与<代码>ui.joint=internal:mer合并,以便我获得所有冲突标志。 然后,我对合并变化表示反对。 一种比喻,但它运作良好。

You can use hg diff with the option -c:

- 交换 修订

<<>t>Tip: use-stat toeck only the file (with and without -c.





相关问题
Can I clone part of a Mercurial repository?

Is it possible to clone part of a Mercurial repository? Let s say the repository is quite large, or contains multiple projects, or multiple branches. Can I clone only part of the repository? E.g. in ...

Sync files in Two Different Repos using HG

I ve got a problem when I try to sync files in two different repos. What I want to do is: I ve got 2 repos A and B, and they share some common files, suppose they lie in A/docs/common/ and B/docs/...

Tips on upgrading CVS to git/hg?

We still use CVS, I use git and hg for my personal use though I m still a novice at both, but I realize they re much more modern and better, faster, distributed, etc. It s just everyone is so ...

git for mercurial like git-svn

Hello is there a tool for git that allow to work with mercurial repositories F.e. for svn there is a git-svn package, that allows to clone/commit/update from svn and work in a git way.. So is there ...

Useful Mercurial Hooks [closed]

What are some useful Mercurial hooks that you have come across? A few example hooks are located in the Mercurial book: acl bugzilla notify check for whitespace I personally don t find these very ...