[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: Micke <u23104331_at_telia.com>
Date: 2007-03-29 09:45:17 CEST

Prasanna Pendse 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?

No solution, I'm afraid.
I think you should be able to generate patches for B's work and apply
them to the head.
If you are using TortoiseSVN you can select both the new FileY and the
orphaned FileX, and then right-click FileY and chose Diff. B's work will
then appear as removed or altered lines of code in FileY in the
diff-viewer. These 'modifications' to FileY can be 'undone' in the
diff-viewer (right-click block and select 'use other text block'), thus
merging B's work into FileY. The result can then be saved. Be careful
not to remove A's work.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 29 09:46:20 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.