[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging issue causing trouble in conversion from ClearCase

From: Jared Hardy <jaredhardy_at_gmail.com>
Date: 2007-03-31 01:27:43 CEST

On 3/27/07, Prasanna Pendse <prasanna.pendse@gmail.com> wrote:
> We can boil this issue down into a simple scenario:
> - Developer A is working on FileX.java on trunk.
> - Developer B is also working on FileX.java on trunk.
> - Developer A renames FileX.java and commits the change.
> - Developer B is stuck and cannot merge.
> Does anyone have a solution to this issue?

I think SVK (svk.bestpractical.com) has a "--track-renames" feature
that might help, but from the SVK mailing list it seems they might
still be working out the kinks in the feature for SVK 2.0.1rc1. If you
have a workstation with sufficient space to mirror the repository, so
you can branch it on an SVK local branch, to test in safe environment,
it may be worth a trial run.

:) Jred

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Mar 31 01:28:03 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.