Windows Next SVN creates branch merge branch conflicts

The system I'm using is win7+subversion 1.7.4. Server Building on the skip, I also find from the Internet, is basically a few orders it! I used the CentOs6.5. A few orders on the Web were built quickly, basically:

1. # sudo yum install subversion

2. # sudo mkdir-p/subroot

3. # sudo svnadmin create/subroot

4. # sudo Vi/subroot/conf/authz

Tail Plus

[/]
Dan=rw
W=r

5. # sudo vi/subroot/conf/passwd

In the [users]

username=passwd

User name = password

6. # sudo vi/subroot/conf/svnserve.conf

anon-access = None #如果设置为read error when creating the branch (unreadable path encountered; Access denied;)
auth-access = Write #授权用户可写
Password-db = passwd #使用哪个文件作为账号文件
Authz-db = Authz #使用哪个文件作为权限文件
Realm =/subroot # certified space name, repository directory

7. # sudo svnserve-d-r/subroot

Start SVN

8. # sudo killall-hup svnserve

Kill SVN Service Command

These are basically the commands to build a Linux server.

And then there's the main operation.

1. SVN Checkout

My svn address is svn://10.208.1.109/trunk.

Under your folder " right button "-" SVN Checkout..."

Enter your SVN address : It is best to copy and paste it, as it is possible to enter the wrong address.

Click OK

Will pop up let you enter username and password

Is that we are

5. # sudo vi/subroot/conf/passwd

In the [users]

username=passwd

Added in the

User name and password

This will update the file.

2. Create a branch

In the Trunk folder " right button "-"TortoiseSVN"-"branch/tag ... 】

Enter the address of the branch in the box that pops up

Click OK

If you do not save the user name and password will again let the input, it is best to save, so you do not have to enter the

Also File not found:transaction ..... What makes an error is usually a file directory or something. You can create the upper layer first, and then the branch directory does not have to be created.

Okay, create a branch success

Let's take a look at what this trunk's SVN address is.

"Right-click" Trunk Folder--" properties " "Subversion"

is already the path to our branch address.

3. Trunk Merge to Branch

Select the branch of the folder as above, the SVN address is

Svn://10.208.1.109/tranches/test = = "Updated catalogue we tentatively ask"Brancher "

Svn://10.208.1.109/trunk = = Updated catalogue We tentatively asked "trunk."

"brancher" folder right -click to see the picture bar

Right button "brancher"

Select the first Merge a range of revisions Click Next

Modify the URL to merge form address here, you need to be careful , Next is next.

Select Compare whitespaces can be tested I don't want to test it. Direct merge Yes, okay.

When there is no conflict.

In the time of conflict

The basic way to complete the merge is to submit the merged code to the test, if there is no problem can be merged skeleton.

4. Branch Merge to Trunk

If you look at the trunk merge into the branch basically branching to the trunk will be

This time change folder click "Trunk"-"right button"

This time the second reintegrate a branch is selected, click Next

Here is also a need to note the from URL: address, This is the address of the branch

Basically, it's the same as it used to be.

It is also possible to let you update, in fact, let the nature of it, so update it, if there is a conflict with the same deal as before, there is nothing to write

Just a brief introduction of the SVN branch, merging issues, I hope all people pointing!!!!

Windows Next SVN creates branch merge branch conflicts