SVN conflict on all lines (LF), while edit a file using Windows then Unix (Mac, Ubuntu)

This is a work around for a problem of committing changes to subversion using multiple operating system and the end of the line conflict.

If you collaborate on a text file or a source code file while multiple people editing the file using Windows and Unix (or Mac),

you might face a challenge for committing changes to subversion.

The problem is the conflict on all lines each time a file edited with Unix then Windows, and vise versa.

To resolve this issue use the following terminal comments to edit the property of the text (source code) file.


svn propset "svn:eol-style" "native" file1.txt

Reference: Red Bean File Property

Find the version of ubuntu

To find out which version of Ubuntu is installed, type the following command in the terminal: lsb_release -a

Example:

$ lsb_release -a
Distributor ID: Ubuntu
Description: Ubuntu 10.04.1 LTS
Release: 10.04
Codename: lucid

SVN terminal, list (log) the last (top) ‘n’ transactions

The followings are terminal commands for getting the details of the last ‘n’ changes to a SVN repository:

Step 1: Find the last revision number:

Use tomorrow date to include the transactions for today. If today is 7 Oct then

$ svn log -r {2010-10-08}
601 | amiraryani | 2010-10-07 18:40:23 +1100 (Thu, 07 Oct 2010) | 1 line

Step2: Now that we know the last revision number is 601, we can get the last 10 transaction between 601 and 591

svn log -r 601:591

also we can get more details by adding –verbose parameter.

svn log -r 601:591 --verbose

References:
fitz.blogspot.com

svnbook.red-bean.com/1.0

svnbook.red-bean.com/en/1.4/