three-way-merge

RCS on Windows - rcsmerge always fails

由 妖精的绣舞 提交于 2021-01-29 04:55:41
问题 I'm using GNU RCS version 5.7 for Windows from the official Purdue RCS homepage. If I use the rcsmerge(1) command to merge changes from different branches, I get an error: diff3.exe: subsidiary program failed every time. Does anyone know why this should happen (and I have seen this problem discussed at least 10 years ago) and what the fix is? Does the GNU current RCS release 5.8.1 fix it? If so, can anyone point me to Windows binaries for this release? UPDATE 2012-10-22: I have switched the

Tool for 3-Way Binary (Hex) File Comparison?

由 这一生的挚爱 提交于 2019-12-21 02:28:15
问题 I have a set of binary configuration files with three versions each -- an original, and two differently-modified versions of each file. I need to be able to see the differences between the two versions as well as the original, all at the same time. What I need is a three-way diff tool for binary files. Through a rather exhausting Google search, I eventually happened upon a screenshot of an application that does exactly what I need -- unfortunately, the forum post containing the image does not

Why are Mercurial backouts in one branch affecting other branches?

由 Deadly 提交于 2019-12-18 11:48:37
问题 This is a difficult situation to explain, so bear with me. I have a Mercurial repository with 2 main branches, default and dev . Work is usually done in a named branch off of dev (a feature branch). There may be many feature branches at any one time. Once work is completed in that branch, it is merged back into dev . When the time comes to prepare a release, another named branch is created off of dev (a release branch). Sometimes it is necessary to exclude entire features from a release. If

Subversion: How to merge only specific revisions into trunk when multiple consecutive changes are made in a branch?

由 风流意气都作罢 提交于 2019-12-17 18:35:31
问题 I have been using TortoiseSVN, svn, and subclipse and I think I understand the basics, but there's one thing that's been bugging me for a while: Merging introduces unwanted code. Here's the steps. trunk/test.txt@r2 . A test file was created with 'A' and a return: A [EOF] branches/TRY-XX-Foo/test.txt@r3 . Branched out the trunk to TRY-XX-Foo : A [EOF] branches/TRY-XX-Foo/test.txt@r4 . Made an unwanted change in TRY-XX-Foo and committed it: A B (unwanted change) [EOF] branches/TRY-XX-Foo/test

Three-way-merge - different philosophies?

由 天大地大妈咪最大 提交于 2019-12-13 13:27:42
问题 I've been a user of UltraCompare Pro since it first came out, and I think it's a very full-featured compare and merge tool. However, since I have been looking more closely into DVCS, I found that it handles three-way merges differently than (most?) other tools out there. So I wonder why that is, and whether I'm missing something because of it. In UltraCompare, there are three merge panels (let's call them base, local and other). All the merge action happens within these panels. In practice,

non-graphical 3-way merge tool

由 試著忘記壹切 提交于 2019-12-10 18:16:42
问题 I currently use RCS' merge command to do 3-way merges, but one thing has always annoyed me about it. If I use the -A option, the same change made in both files shows up as a conflict: <<<<<<< file1 file1 line 1 ||||||| orig orig line 1 ======= file2 line 1 >>>>>>> file2 orig line 2 <<<<<<< orig ======= line added in both changes >>>>>>> file2 orig line 3 If I use the default (-E) then those identical changes are not shown, but then the ouput only shows the two contributors, not the ancestor,

How can I use Beyond Compare 3 as the diff3-cmd for svn?

由 孤街浪徒 提交于 2019-12-04 19:55:05
问题 I saw this posting which explained how to get BC3 working as the diff tool for Subversion... but what about using Beyond Compare 3 to do 3-way merge/compares? 回答1: To do this, create a batch file called (for example) diff3wrap.bat, and setup your diff3-cmd in your SVN config to point at it. The following diff3wrap.bat file will do the job. It creates a temporary filename for the merge output and deletes it after returning the merged contents back to SVN. @ECHO OFF SET DIFF3="C:\Program Files

How do I specify a merge-base to use in a 'hg merge'

由 只愿长相守 提交于 2019-12-04 13:12:13
问题 I'm trying to do a complicated merge in a complicated hg repository. I'm not happy with the "newest shared ancestor" that Mercurial chooses to use as the "base" to perform the merge. I'd like to specify a specific commit of my own choice to use as base. Is this possible, and if so, how? 回答1: Mercurial 3.0: You can now select the ancestor to use as a merge base. You do that by setting merge.preferancestor . Mercurial will tell you about it when this makes sense. With the example below, you

How can I use Beyond Compare 3 as the diff3-cmd for svn?

由 旧城冷巷雨未停 提交于 2019-12-03 12:47:28
I saw this posting which explained how to get BC3 working as the diff tool for Subversion... but what about using Beyond Compare 3 to do 3-way merge/compares? To do this, create a batch file called (for example) diff3wrap.bat, and setup your diff3-cmd in your SVN config to point at it. The following diff3wrap.bat file will do the job. It creates a temporary filename for the merge output and deletes it after returning the merged contents back to SVN. @ECHO OFF SET DIFF3="C:\Program Files\BeyondCompare3\BComp.exe" REM Subversion provides the paths we need as the last three parameters REM These

Tool for 3-Way Binary (Hex) File Comparison?

由 蹲街弑〆低调 提交于 2019-12-03 08:06:51
I have a set of binary configuration files with three versions each -- an original, and two differently-modified versions of each file. I need to be able to see the differences between the two versions as well as the original, all at the same time. What I need is a three-way diff tool for binary files. Through a rather exhausting Google search, I eventually happened upon a screenshot of an application that does exactly what I need -- unfortunately, the forum post containing the image does not mention what application it is they're using: http://www.xboxhacker.org/index.php?topic=15032.0 Can
订阅 three-way-merge