[Bug-gnu-emacs] Emacs/RCS Win2000 'Merge Branches' Fails

[Dick Jackson]

Hi,

I am a very satisfied user of Emacs and RCS, due to the excellent work on
everyone's part out there, thanks! And I now have a need for using the Merge
Branches feature. I tried it with an existing test file, and when it failed,
I made up the simplest possible test case (attached files - note: to set it
up as I had it, RCS-rcstest2.pro should be renamed rcstest2.pro and put in a
subdirectory RCS), picked up the newest versions of Emacs and RCS, and I
still see the problem.

In GNU Emacs 20.7.1 (i386-*-nt5.0.2195)
 of Tue Jun 13 2000 on buffy
configured using `configure NT'

Please describe exactly what actions triggered the bug
and the precise symptoms of the bug:

- Created file rcstest2.pro with RCS $Id$, $Log$ and ';; Just one line'
- registered it with RCS (saved as revision 1.1)
- checked it out, made a change (added ';; One more line')
- checked in as revision 1.2
- moved to revision 1.1
- checked it out, made a change (added ';; Sneak a line in branching from
1.1')
- checked in as revision 1.1.1.1
(at this point everything is perfect, I can visit all these versions! Now I
want to merge 1.1.1.1 changes into 1.2...)
- moved to revision 1.2
- typed C-x v m, answered 'yes' to Lock now?
- for 'branch to merge from', typed 1.1, then 1.1.1 for 'second version'

This is what resulted in *vc*:

RCS file: f:/Emacs-other/RCS/rcstest2.pro
retrieving revision 1.1
retrieving revision 1.1.1.1
Merging differences between 1.1 and 1.1.1.1 into rcstest2.pro
diff3.exe: subsidiary program failed

(I saw the same behaviour with Emacs 20.4 and the previous RCS 5.7 from
1997, except that the final message said "diff3.exe: broken pipe")

For completeness, here are the bug-report items:

Recent input:
down return C-x C-q y e s return return ; ; SPC S n
e a k SPC a SPC l i n e SPC i n SPC f r o m SPC 1 .
1 M-left M-left M-left b r a n g i n backspace backspace
backspace c h i n g SPC C-x C-q y B r a n g backspace
c h SPC f r o m SPC 1 . 1 C-v C-c C-c C-u C-x C-q return
C-x v m y 1 . 1 return 1 . 1 . 1 return drag-n-drop
menu-bar help-menu report-emacs-bug

Recent messages:
Note: file is write protected
Checking out f:/Emacs-other/rcstest2.pro...
Checking out f:/Emacs-other/rcstest2.pro...done
Note: file is write protected
Checking out f:/Emacs-other/rcstest2.pro...
Checking out f:/Emacs-other/rcstest2.pro...done
Running rcsmerge...FAILED (status 2)
Loading emacsbug...
Loading emacsbug...done
End of buffer

Any help you can provide would be *greatly* appreciated.

Cheers,
--
-Dick

Dick Jackson                     /         dick@d-jackson.com
D-Jackson Software Consulting   /    http://www.d-jackson.com
Calgary, Alberta, Canada       /   Voice/Fax: +1-403-242-7398

rcstest2.pro
Description: Binary data

RCS-rcstest2.pro
Description: Binary data