Re: merging trunk to branch merges the whole trunk history

2010-02-17 Thread Eli S
Stefan Sperling wrote: On Tue, Feb 16, 2010 at 10:42:59PM -0800, Eli S wrote: Apologies to for letting this languish. I was waiting on an upgrade and the system administrators upgraded to 1.6.6 on Ubuntu. The repository and branch were created on 1.5.1 using cvs2svn. The branch was created

merging trunk to branch merges the whole trunk history

2010-02-16 Thread Eli S
Apologies to for letting this languish. I was waiting on an upgrade and the system administrators upgraded to 1.6.6 on Ubuntu. The repository and branch were created on 1.5.1 using cvs2svn. The branch was created using svn copy between URLs. My problem is that when I upgrade trunk to branch I