Re: merging trunk to branch merges the whole trunk history

2010-02-17 Thread Stefan Sperling
On Wed, Feb 17, 2010 at 06:24:35AM -0800, Eli S wrote: > Once we upgrade, can I recover > using the same ideas? Do I have to mark the trunk in any way? > I don't think you need to do anything apart from upgrading the server. Subversion should be able to figure this out automatically. It just need

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 us

Re: merging trunk to branch merges the whole trunk history

2010-02-17 Thread Stefan Sperling
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 using svn copy between

RE: merging trunk to branch merges the whole trunk history

2010-02-03 Thread Srilakshmanan, Lakshman
Hi, Did you use svn copy FromURL ToURL when you created your branch ? ie svn copy http:///svn//trunk http:///svn//branches/ Thanks Lakshman -Original Message- From: esatel [mailto:eli-s...@pacbell.net] Sent: Wednesday, 3 February 2010 2:30 PM To: users@subversion.apache.org Subject: me

Re: merging trunk to branch merges the whole trunk history

2010-02-03 Thread Stefan Sperling
On Tue, Feb 02, 2010 at 07:30:27PM -0800, esatel wrote: > Hi, > I have an svn repository created by converting an old cvs repository > using SVN 1.5.1. > > If I do the following: > 1. Create a branch around trunk revision 1598 > 2. Work a bit further on the trunk and commit (I don't think this is

Re: merging trunk to branch merges the whole trunk history

2010-02-03 Thread Ulrich Eckhardt
On Wednesday 03 February 2010, esatel wrote: > If I do the following: > 1. Create a branch around trunk revision 1598 What is a "branch around trunk"? Or, do you mean a branch around the time that trunk had revision 1598? If so, you have a conceptual error here, as it is not trunk that has that