Re: Fix a folder change

Hey Sam,

I think what you are after is a reverse merge. Check the documentation
for that here:

http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo

Cheers,

Stanley

On 4/07/2009 1:24 AM, Sam Carleton wrote:
> I created branch v0.9.2.2 back in r586 and the current is r620. The
> truck was r629 and I merged back in the branch (r620) back to the trunk
> to make the current v630. The problem is in the trunk at r626 to r627,
> a folder under the trunk was moved:
>
> Added: /trunk/KVS
> Added: /trunk/KVS/KioskViewingStation (copy from path
> /trunk/KioskViewingStation)
> Deleted /trunk/KioskViewingStation
>
> All I really want to do is undo r627 through r629 (all changes between
> these are within /trunk/KVS). I want to continue the development on
> this stuff in v0.9.2.3, which is a branch of v0.9.2.2, not in the trunk,
> so I want to be able to merge later.
>
> An alternative approach might be to merge only the r627~r629 into the
> branch.
>
> Sam

-- 
Stanley Klemme
Technical Officer (Software)
Rio Tinto Centre for Mine Automation
Australian Centre for Field Robotics
Rose Street Building, J04
University of Sydney, NSW 2006
Phone + 61 2 9114 0628
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2367920
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].