[FFmpeg-devel] Question about merging files with svn

[Luca Abeni]

Hi all,

I plan to apply my first "RTP headers cleanup" patch
(http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2009-January/059453.html)
soon. This patch basically merges rtp_internal.h into rtp.h.

Now, I am not sure what's the proper way to do it with svn: "svn cp" will
not work (I thins), because rtp_internal.h is merged in a file that is
already in the repository. Any suggestion?
Or can I simply apply the patch, do a "svn rm rtp_internal.h", and I am
done?


				Thanks,
					Luca