Requesting Branch Management Advice...

[Mel Riffe]

Ok, hopefully this is an easy one.

I'm nearly finished upgrading an old Rails project to Rails 3.2.x. And of course the directory structure is different; in fact I also cleaned house and moved a lot things around.

Yes, on this project, I'm still using Subversion :-(

I don't think I want to attempt a merge unto my development branch or trunk.

Can I, instead, make my new upgrade branch my development branch, and copy it to a new trunk?

What's a good way to avoid the nasty merge and yet maintain my development branch and trunk?

Thanks!

--Mel

[Mel Riffe]

I like that idea too.

That's my path forward! Thanks for the feedback.

On Tue, Jun 10, 2014 at 2:27 PM, Max Schubert <max.sc...@gmail.com> wrote:

I like the idea of:

* Rename the current trunk to a different name with svn rename / mv

* Rename your upgrade branch to trunk

Simple, maintains history, and yes, avoids meta-data synchronization hell.

--
You received this message because you are subscribed to the Google Groups "Central Virginia Ruby Enthusiasts Group" group.
To unsubscribe from this group and stop receiving emails from it, send an email to cvruby+un...@googlegroups.com.
To post to this group, send email to cvr...@googlegroups.com.
Visit this group at http://groups.google.com/group/cvruby.
For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups "Central Virginia Ruby Enthusiasts Group" group.
To unsubscribe from this group and stop receiving emails from it, send an email to cvruby+un...@googlegroups.com.
To post to this group, send email to cvr...@googlegroups.com.
Visit this group at http://groups.google.com/group/cvruby.
For more options, visit https://groups.google.com/d/optout.