life ideas

October 23, 2006

Subversion

Filed under: software — manoftoday @ 6:20 am

1)no undo-checkout

On Thu, 2005-01-27 at 23:43, David S. wrote:
> Some version control systems have the notion of undo check-out. In can
> see that with Subversion you can revert.
‘svn revert’ is used to undo the changes you make. You can’t
undo a checkout with ‘svn revert’.
Checkout in subversion means, you get a local copy of the repository,
or a portion of the repository. The server does not keep track of
working copies – If you need to get rid of a working copy, just
delete it.
> But what if you want to
> eliminate your view altogether? Do you just delete the directory?
>
> Thanks.
>
2) Commit failed: file has inconsistent newlines.

http://www.hanselman.com/blog/CategoryView.aspx?category=Subversion

3)  can not show diff because of inconsistent newlines in file

cannot show diff because of inconsistent newlines in file的解决方法

cannot show diff because of inconsistent newlines in file

有时候比较两个文件时,因为存在不同的换行格式,导致上面这个错误。

错误原因应该是TortoiseSVN自带的比较工具TortoiseMerge目前无法处理不同的换行格式。

解决方法:使用WinMerge作为外部比较工具

步骤:
1、下载WinMerge 2.6.0(本站下载区)或http://winmerge.org/downloads.php

2、安装WinMerge,在“选择额外任务”对话框中,将“integrate with TortoiseSVN”选上,

安装后,TortoiseSVN中的外部比较工具变成

e:\Program Files\WinMerge\WinMergeU.exe -e -x -ub -dl %bname -dr %yname %base %mine

(假设你的WinMerge安装在e:\Program Files\WinMerge)

再进行比较时,就不会出现cannot show diff because of inconsistent newlines in file了

http://www.iusesvn.com/bbs/thread-413-1-1.html

Advertisements

Leave a Comment »

No comments yet.

RSS feed for comments on this post. TrackBack URI

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

Create a free website or blog at WordPress.com.

%d bloggers like this: