Subversion Revert File will not be shown in Modification

I was trapped by the following scenario:

I had a new set update to the production version, let‘s say revision 371

A couple of changes are just reverting files back to revision 369. So I just revert the files in my working copy back to revision 369.

Few weeks later client approved all changes and request me to implement.

I just right click my working copy and run "Check For Modifications", the changes files listed would be transferred to production environment.

However today I realised the file revertted back to revision 369 were not implemented. I thought it is just my oversight and not see those changes.

But the reverted file do have green tick meaning there were no changes to them.

After reading the explaination on web, It shows the revert file are not treated as changes.

***I learnt that we also need to run "Check For Modifications" then click "Check Repository" and this can show the difference to the latest version on repository.

To prevent the issue and do the committable revert, following inform works for me:

http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-howto-rollback.html

Roll back (Undo) revisions in the repository

Use the revision log dialog

By far the easiest way to revert the changes from one or more revisions, is to use the revision log dialog.

  1. Select the file or folder in which you need to revert the changes. If you want to revert all changes, this should be the top level folder.
  2. Select TortoiseSVN → Show Log to display a list of revisions. You may need to use Show All or Next 100 to show the revision(s) you are interested in.
  3. Select the revision you wish to revert. If you want to undo a range of revisions, select the first one and hold the Shift key while selecting the last one. If you want to pick out individual revisions and ranges, use the Ctrl key while selecting revisions.Right click on the selected revision(s), then select Context Menu → Revert changes from this revision.
  4. Or if you want to make an earlier revision the new HEAD revision, right click on the selected revision, then select Context Menu → Revert to this revision. This will discard all changes after the selected revision.

You have reverted the changes within your working copy. Check the results, then commit the changes.

Use the merge dialog

If you want to enter revision numbers as a list, you can use the Merge dialog. The previous method uses merging behind the scenes; this method uses it explicitly.

  1. In your working copy select TortoiseSVN → Merge.
  2. In the Merge Type dialog select Merge a range of revisions.
  3. In the From: field enter the full repository URL of your working copy folder. This should come up as the default URL.
  4. In the Revision range to merge field enter the list of revisions to roll back (or use the log dialog to select them as described above).
  5. Make sure the Reverse merge checkbox is checked.
  6. In the Merge options dialog accept the defaults.
  7. Click Merge to complete the merge.

You have reverted the changes within your working copy. Check that the results are as expected, then commit the changes.

Use svndumpfilter

Since TortoiseSVN never loses data, your “rolled back” revisions still exist as intermediate revisions in the repository. Only the HEAD revision was changed to a previous state. If you want to make revisions disappear completely from your repository, erasing all trace that they ever existed, you have to use more extreme measures. Unless there is a really good reason to do this, it is not recommended. One possible reason would be that someone committed a confidential document to a public repository.

The only way to remove data from the repository is to use the Subversion command line toolsvnadmin. You can find a description of how this works in the Repository Maintenance.

时间: 2024-10-26 23:45:40

Subversion Revert File will not be shown in Modification的相关文章

Warning: File `src/core/nginx.h' has modification time 1.2e+07 s in the future

Nginx安装时Warning: File `src/core/nginx.h' has modification time 1.2e+07 s in the future问题的解决方法 问题场景: 解压文件:tar -zxvf nginx-1.7.4.tar.gz nginx-1.7.4/ nginx-1.7.4/auto/ nginx-1.7.4/conf/ tar: nginx-1.7.4/auto: time stamp 2014-08-05 19:13:10 is 12165186.0

版本管理器subversion的简单配置以及和apache的结合使用

linux下subversion+apache的配置我在网上看过很多关于subversion配置的blog,但是按照其 上操作并不能成功配置,也讲的不是很清楚.在此向大家推荐<使用Subversion进行版本控制>一书,网上有中文电子档,该书对subversion有很详细的介绍,感兴趣的朋友可以去看一下.这里我只介绍subversion基本使用方法,以及和apache的结合. 1.基本使用方法 svn 命令行客户端程序 svnversion 此工具用来显示工作拷贝的状态 svnlook 直接查

[svn operation]-revert and -update

[revert]revert: Restore pristine working copy file (undo most local edits).usage: revert PATH... Note:  this subcommand does not require network access, and resolves  any conflicted states.  However, it does not restore removed directories.  [update]

Mac 操作系统安装 SVN server教程(Subversion With Mac OS X Tutorial)

Find recent articles on my github page: rubyrobot.github.io ? 2006-2014 Imagine Ecommerce Subversion With Mac OS X Tutorial Updated: April 2011 Subversion is a version control system that allows you to work with other people on a project and switch b

Mac 操作系统安装 SVN 服务器教程(Subversion With Mac OS X Tutorial)

Find recent articles on my github page: rubyrobot.github.io © 2006-2014 Imagine Ecommerce Subversion With Mac OS X Tutorial Updated: April 2011 Subversion is a version control system that allows you to work with other people on a project and switch b

Global UNIX file system cylinder group cache

A global?cylinder?group?(CG) cache is stored in file server memory and shared by a plurality of file systems supported by the file server. The global CG cache comprises a number CG entries which are pre-allocated in memory. As different file systems

[No000098]SVN学习笔记5-分支,合并,属性,补丁,锁,分支图

行结束符和空白选项 在项目的生命周期中,有时可能会将行结束符由 CRLF 改为 LF,或者修改一段代码的缩进.不幸的是这样将会使大量的代码行被标记为已修改,尽管代码本身并没有被修改.这里列出的选项将会在比较差异 和应用补丁时帮助你应对这些修改.你将会在合并和追溯对话框中看到这些设置,它们同样也出现在TortoiseMerge 的设置中. 忽略行结束符 排除仅行结束符的差异. 比较空白 将所有缩进和行内空白差异视为增加/删除的行. 忽略空白修改 排除那些完全是针对空白数量或类型的修改,例如,修改缩

SVN三部曲之SVN设置详解深入

想知道不同的设置是干什么用的,你只需将鼠标指针在编辑框/选项框上停留一秒钟...一个帮助提示气泡就会弹出来. 常规设置 图 4.68. 设置对话框,常规设置页面 这个对话框允许你指定自己喜欢的语言,同时也可做那些与Subversion相关的特殊设置. 语言 Selects your user interface language. Of course, you have to install the corresponding language pack first to get another

C语言宏预处理帮助文档

GCC4.10预处理器帮助文档 The C Preprocessor Transformations Made Globally Most C preprocessor features are inactive unless you give specific commands to request their use. (Preprocessor commands are lines starting with `#'; see section Preprocessor Commands).