[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: Peter Samuelson <peter_at_p12n.org>
Date: 2007-03-29 06:52:29 CEST

First, please don't crosspost between the users and dev lists. This is
a question for the users list.

[Prasanna Pendse]
> - 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.

The real solution is to hire somebody to finish the "true renames"
feature in Subversion. This seems simple enough but in fact it's a
rather difficult job. Work is in progress on the 'fs-atomic-renames'
branch of the Subversion repository, but I think it's currently stalled
for want of manpower.

Unfortunately, I can't think of a better workaround than just to
coordinate work so as to avoid hitting this case.

Received on Thu Mar 29 06:52:51 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.