You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Roger Booth <ro...@yahoo.com> on 2004/12/06 06:12:59 UTC

svn move, then svn revert, then svn commit doesn't revert

I did the following:

D:\MyStuff\MyViewer>svn move MyViewer\ListView.cpp
WinLib\ListView.cpp
A         WinLib\ListView.cpp
D         MyViewer\ListView.cpp

D:\MyStuff\MyViewer>svn move MyViewer\TreeView.cpp
WinLib\TreeView.cpp
A         WinLib\TreeView.cpp
D         MyViewer\TreeView.cpp

D:\MyStuff\MyViewer>svn move MyViewer\ContentView.cpp
WinLib\ContentView.cpp
A         WinLib\ContentView.cpp
D         MyViewer\ContentView.cpp

D:\MyStuff\MyViewer>svn move MyViewer\ListView.h
WinLib\ListView.h
A         WinLib\ListView.h
D         MyViewer\ListView.h

D:\MyStuff\MyViewer>svn move MyViewer\TreeView.cpp
WinLib\TreeView.h
svn: Path 'MyViewer/TreeView.cpp' does not exist

D:\MyStuff\MyViewer>svn move MyViewer\TreeView.h
WinLib\TreeView.h
A         WinLib\TreeView.h
D         MyViewer\TreeView.h

D:\MyStuff\MyViewer>svn move MyViewer\ContentView.h
WinLib\ContentView.h
A         WinLib\ContentView.h
D         MyViewer\ContentView.h

D:\MyStuff\MyViewer>svn move MyViewer\Directory.cpp
WinLib\Directory.cpp
A         WinLib\Directory.cpp
D         MyViewer\Directory.cpp

D:\MyStuff\MyViewer>svn move MyViewer\Directory.h
WinLib\Directory.h
A         WinLib\Directory.h
D         MyViewer\Directory.h

D:\MyStuff\MyViewer>svn move MyViewer\Source.cpp
WinLib\Source.cpp
A         WinLib\Source.cpp
D         MyViewer\Source.cpp

D:\MyStuff\MyViewer>svn move MyViewer\Source.cpp
WinLib\Source.h
svn: Path 'MyViewer/Source.cpp' does not exist

D:\MyStuff\MyViewer>svn move MyViewer\Source.h
WinLib\Source.h
A         WinLib\Source.h
D         MyViewer\Source.h

D:\MyStuff\MyViewer>svn move WinLib\ContentView.h
MyViewer\ContentView.h
svn: Use --force to override this restriction
svn: Move will not be attempted unless forced
svn: 'WinLib/ContentView.h' has local modifications

D:\MyStuff\MyViewer>svn revert ContentView.cpp
svn: Cannot revert: 'ContentView.cpp' is not under
version control

D:\MyStuff\MyViewer>svn revert winlib\ContentView.cpp
Reverted 'WinLib\ContentView.cpp'

D:\MyStuff\MyViewer>svn revert winlib\ContentView.h
Reverted 'WinLib\ContentView.h'

D:\MyStuff\MyViewer>svn commit --message "Moved
ListView, TreeView, Directory and Source to WinLib
Deleting       MyViewer\MyViewer\ContentView.cpp
Deleting       MyViewer\MyViewer\ContentView.h
Deleting       MyViewer\MyViewer\Directory.cpp
Deleting       MyViewer\MyViewer\Directory.h
Deleting       MyViewer\MyViewer\ListView.cpp
Deleting       MyViewer\MyViewer\ListView.h
Sending        MyViewer\MyViewer\MyViewer.vcproj
Deleting       MyViewer\MyViewer\Source.cpp
Deleting       MyViewer\MyViewer\Source.h
Deleting       MyViewer\MyViewer\TreeView.cpp
Deleting       MyViewer\MyViewer\TreeView.h
Adding         MyViewer\WinLib\Directory.cpp
Adding         MyViewer\WinLib\Directory.h
Adding         MyViewer\WinLib\ListView.cpp
Adding         MyViewer\WinLib\ListView.h
Adding         MyViewer\WinLib\Source.cpp
Adding         MyViewer\WinLib\Source.h
Adding         MyViewer\WinLib\TreeView.cpp
Adding         MyViewer\WinLib\TreeView.h
Transmitting file data .
Committed revision 4.

D:\MyStuff\MyViewer>


I expected ContentView.h and ContentView.cpp to be
present in MyViewer\MyViewer. Instead, they were
present in MyViewer\WinLib.

D:\MyStuff\MyViewer>svn --version
svn, version 1.1.1 (r11581)
   compiled Oct 23 2004, 14:47:47

Copyright (C) 2000-2004 CollabNet.
Subversion is open source software, see
http://subversion.tigris.org/
This product includes software developed by CollabNet
(http://www.Collab.Net/).

The following repository access (RA) modules are
available:

* ra_dav : Module for accessing a repository via
WebDAV (DeltaV) protocol.
  - handles 'http' schema
  - handles 'https' schema
* ra_local : Module for accessing a repository on
local disk.
  - handles 'file' schema
* ra_svn : Module for accessing a repository using the
svn network protocol.
  - handles 'svn' schema


D:\MyStuff\MyViewer>


I'm on Windows 2000 with all the latest Windows
Updates.

Roger Booth


		
__________________________________ 
Do you Yahoo!? 
Take Yahoo! Mail with you! Get it on your mobile phone. 
http://mobile.yahoo.com/maildemo 

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org