两个命名分支的Mercurial合并:工作目录没有祖先 [英] Mercurial Merge of Two Named Branches: Working Directory Has No Ancestor

问题描述

我有两个命名分支，SPRINT_009和SPRINT_010.一些变更集已提交给SPRINT_009，我想将其合并到SPRINT_010中.我能够将branch_one的变更集合并回默认值，而不会遇到任何麻烦.我在将变更集从branch_one合并到branch_two时遇到问题.

I have two named branches, SPRINT_009 and SPRINT_010. Some changesets have been committed to SPRINT_009 that I would like to merge into SPRINT_010. I was able to merge the changesets from branch_one back into default without any trouble. I am having problems merging the changesets from branch_one into branch_two.

default       A -- B -- C -- G -- H -- I -- J -- K -- L -- N -- O -- P
                         \                             \            /
SPRINT_009     D -- E -- F -----------------  ---------- ----------
                                                         \
SPRINT_010                                                M

这是我正在使用的命令:

Here are the commands I am using:

hg update branch_two
hg merge branch_one

但是我收到以下消息:

abort: merging with a working directory ancestor has no effect

有人知道我到底在做什么错吗?

Does anyone know what exactly I am doing wrong?

**我已经添加了图形的图片.该图是概念性**

** I've added a picture of the graph. The drawing is conceptual **

推荐答案

问题是我在尝试合并之前没有执行hg pull.通常，我们使用TortoiseHg在Windows机器上进行开发.我们在support分支上修改了我们的资源之一的名称，从fooBAR更改为fooBar，并遇到了 mercurial案例折叠问题.我们试图通过合并Linux框上的分支来解决此问题.我已经习惯了使用TortoiseHg，以至于我忘记了最基本的命令！

The problem was that I hadn't performed an hg pull before attempting the merge. Normally we do our development on a Windows machine using TortoiseHg. We modified the name of one of our resources on the support branch, from fooBAR to fooBar and ran into the mercurial case folding problem. We were trying to get around this by merging the branches on a Linux box. I am so used to using TortoiseHg that I forgot the most basic of commands!

这篇关于两个命名分支的Mercurial合并:工作目录没有祖先的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！