Reference: http://www.orcaware.com/svn/wiki/Svnmerge.py
>svn checkout http://asdf.com/svn/project/branches/release_1.0
>svn update
——————-
>set path=%path%;C:\Program Files\svnmerge\;
>svnmerge avail
40253,40276-40234,40233,40210
>svnmerge avail –log
>svnmerge merge -r40253,40276-40234,40233,40210
>svn commit -F svnmerge-commit-message.txt
Is it the time to move from SVN to GIT?
Check this links
https://git.wiki.kernel.org/index.php/GitSvnComparison
http://git-scm.com/
http://www.codebasehq.com/
One drawback I observed in GIT:
Generally people can steal source code, with GIT they can steal code along with version history. : (
>mvn install
is causing following error
[info] svn: ‘c:\path\folder’ is not a working copy
[INFO] ————————————————————————
[ERROR] BUILD ERROR
[INFO] ————————————————————————
[INFO] Could not get SVN revision
Embedded error: svn: ‘c:\path\folder’ is not a working copy
[INFO] ————————————————————————
[INFO] For more information, run Maven with the -e switch
[INFO] ————————————————————————
Solution:
Check with team and use the correct version of TortoiseSVN.
Or the version user is using must be in sync with server version.
Check 1: Make sure that system dont have svn available with other versions.
First of all, subversion client is not required in windows if using Tortoisesvn
-o-
Problem Statement:
svn: Processing PROPFIND request response failed: Content is not allowed in prolog. (/svn/project1/module1)
svn: PROPFIND request failed on ‘/svn/project1/module1′
svn: Processing PROPFIND request response failed: Content is not allowed in prolog. (/svn/project1/module1)
svn: PROPFIND request failed on ‘/svn/project1/module1′
RA layer request failed
svn: PROPFIND of ‘/svn/project1/module1′: 200 OK (http://localserver)
Solution:
Server SVN version is 1.4.8. Client version used is 1.6.6
After uninstalling 1.6.6 and installing 1.4.8 all issues resolved.
-o-