SVN

From Null-pointer

Contents 1 Global ignores 2 branch 3 merge 3.1 Trunk into a branch 3.2 Branch into trunk 4 References

Global ignores

[root@localhost ~]# cd C:\Documents and Settings\paulkane\Application Data\Subversion

[root@localhost C:\Documents and Settings\paulkane\Application Data\Subversion]# notepad config

global-ignores = *.ipr *.iml *.iws

branch

[root@localhost ~]# svn copy trunkURL branchURL -m "message"

merge

Trunk into a branch

• this merges the trunk into a branch

[root@localhost ~]# svn co trunkURL projectName.trunk

[root@localhost ~]# cd projectName.trunk

[root@localhost ~/projectName.trunk]# svn log -l5

• get the revision number yyyy

[root@localhost ~]# svn co branchURL projectName.branch

[root@localhost ~]# cd projectName.branch

[root@localhost ~/projectName.branch]# svn log --stop-on-copy

• get the revision number xxxx

[root@localhost ~]# cd projectName.branch

[root@localhost ~/projectName.branch]# svn merge -rxxxx:yyyy trunkURL ^[1]

Branch into trunk

[root@localhost ~]# svn co branchURL projectName.branch

[root@localhost ~]# cd projectName.branch

[root@localhost ~/projectName.branch]# svn log --stop-on-copy

• get the revision number xxxx

[root@localhost ~]# svn co trunkURL projectName.trunk

[root@localhost ~]# cd projectName.trunk

[root@localhost ~]# svn up

• get the revision number yyyy

[root@localhost ~/projectName.trunk]# svn merge -rxxxx:yyyy branchURL ^[1]

References

1. ↑ ^{1.0 1.1} Michael Sepcot. (11 Apr 2007). "SVN: Merging a Branch into Trunk" Retrieved 24 Jan 2011.