On 21 mai, 23:57, "Michael Cole" <mc...@forbin.com> wrote: > Hello, > > I created a development branch and I'm trying to reintegrate that branch > back into the trunk. My question is two-fold: > > 1) After reintegration, I can delete my branch, correct?
Yes indeed. In the worse case, we can still check out your branch at a specific revision or date. > > 2) When I attempt to reintegrate, I am getting the following error: > Error: Retrieval of mergeinfo unsupported by '...my repo path...'. The > research that I've done suggested I need to upgrade my server version of > Subversion, but I would like to avoid doing this because of the > corporate red tape. Any other suggestions? That's because you use a client version 1.5, don't you. As such, it tries to use a feature called "merge tracking" which is not supported by your server (supposely in version 1.4) You can either upgrade the server to v1.5 or downgrade the client to version 1.4 Régis
