[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: Daniel Rall <dlr_at_collab.net>
Date: 2007-03-31 01:04:27 CEST

On Tue, 27 Mar 2007, Prasanna Pendse wrote:

> I'm working at a large Fortune 100 company on a project converting from
> ClearCase to Subversion. We've got a problem and need you guys' help.
>
> - One team is working on trunk (say TeamOne).
> - Another team is working on a branch (say TeamTwo).
> - TeamTwo is re-organizing the directory structure of the same code base.
> Files being moved from one dir to another to facilitate clean atomic builds.
> - TeamOne is continuing feature development without making any dir structure
> changes.
> - We need to merge from the branch to trunk.
> - We want the contents on trunk to appear in the directory structure that
> came from the branch.
>
> We can't do this right now. It overwrites the changes made on trunk. If you
> try to merge from trunk to branch, it says the file doesn't exist (because
> it does an 'Add/Delete' and its not the same object any more).
>
> 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?

Prasanna, this sounds like open bug 2685 [1], which is loosely related
to True Renames (issue 898 [2]). We'd welcome a patch fixing this
problem.

- Dan

[1] http://subversion.tigris.org/issues/show_bug.cgi?id=2685
[2] http://subversion.tigris.org/issues/show_bug.cgi?id=898

  • application/pgp-signature attachment: stored
Received on Sat Mar 31 01:04:44 2007

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