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

Fix a folder change

From: Sam Carleton <scarleton_at_miltonstreet.com>
Date: Fri, 3 Jul 2009 11:24:35 -0400

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

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2367827

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-03 17:27:41 CEST

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.