I spent some time learning RCS, wearing my unix tool archeologist hat. I encountered a weird behavior wrt rcsmerge. I've googled rcsmerge, I Read The FM, etc, but found no explanation to this behavior below. I'd expect to see all three letters a b and c with possible conflict markers at the bottom.
% echo b >f
% ci -l -t-f f
f,v <-- f
initial revision: 1.1
done
% echo c >>f
% ci -mc f
f,v <-- f
new revision: 1.2; previous revision: 1.1
done
% co -l -r1.1 f
f,v --> f
revision 1.1 (locked)
done
% sed -i '1ia' f
% ci -ma f
f,v <-- f
new revision: 1.1.1.1; previous revision: 1.1
done
% co -r1.2 -l f
f,v --> f
revision 1.2 (locked)
done
% rcsmerge -r1.1.1.1 f
RCS file: f,v
retrieving revision 1.1.1.1
retrieving revision 1.2
Merging differences between 1.1.1.1 and 1.2 into f
% cat f
b
c
%
I think I might have missed something in the manual. My question is: how you really merge revisions with RCS?!