2) Add SVN Ignore property
3) Create branch based on trunk
4) Switch to new branch
5) Merge dry run
6) Real megring
1) svn checkout https://xp-dev.com/svn/donald456/trunk -r HEAD --depth=infinity --force
2) svn propset svn:ignore "index.php" C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/donaldtrunk
3) svn copy -rHEAD https://xp-dev.com/svn/donald456/trunk https://xp-dev.com/svn/donald456/branches/grana001
4) svn switch https://xp-dev.com/svn/donald456/branches/grana001 C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/donaldtrunk -r HEAD --force
5) svn merge --dry-run --depth=infinity https://xp-dev.com/svn/donald456/trunk@HEAD \
https://xp-dev.com/svn/donald456/branches/grana002@HEAD \
C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/donaldtrunk \
--- Merging differences between repository URLs into C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/donaldtrunk
U C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/donaldtrunk
Dry-run merge complete.
==== Property Statistics: =====
Updated: 1
6) svn merge --depth=infinity https://xp-dev.com/svn/donald456/trunk@HEAD \
https://xp-dev.com/svn/donald456/branches/grana002@HEAD \
C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/donaldtrunk
--- Merging differences between repository URLs into C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/donaldtrunk
U C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/donaldtrunk
Merge complete.
==== Property Statistics: =====
Updated: 1
No comments:
Post a Comment