SVN in branch merger and Game Patch (1)

Recently to hadoop2.4 on the above line of HDFs raid, but before the HDFs raid such as SVN's branch development, the leader wants to patch the HDFS RAID function inside the goal trunk, which involves SVN Branch and trunk merge problem, below is the detailed process of HDFs raid patch.

1. Ensure that the branch branch of the current HDFs raid is clean. This means that using SVN status does not see any local changes.

2, the trunk of all the patches into the trunk. and submit these patches

3. Switch the command line to the Trunk folder. Run:

SVN merge Https://example.com/hadoop-2.4.0/branch/hadoop-2.4.0-hdfs-raid/

Merge the modifications on the branch branch back into the trunk.

Of course in the merge you can also specify that those version number changes on branch can be merged into the trunk. Commands such as the following:

SVN merge Https://example.com/hadoop-2.4.0/branch/hadoop-2.4.0-hdfs-raid/r117893:HEAD

In the demo example above, all modifications to the HDFs RAID branch from the version number 117893 to the current version number are incorporated into the trunk.

Of course you can also merge some of the updates in the trunk into the HDFs RAID branch, or the same method.

4 . If a merge conflict occurs, it is resolved (http://zccst.iteye.com/blog/1765519). You can then patch the HDFs RAID branch code based on the trunk, command:

SVN diff > Hdfs-raid.patch

When you hit patch, you find that you can only hit the code in the HDFs change section, and the new add code in the Raid section does not come in, you need to do the following:

SVN add Hadoop-tools/hadoop-raid/

Run SVN status and Discoverfiles under Hadoop-tools/hadoop-raid/target are also add. This part of the file is not required to be submitted to SVN, you need to revoke SVN add, run the following command:

svn revert--recursive Hadoop-tools/hadoop-raid/target

When running SVN status, this time you find that only the required files are added, and then run the patch command:

SVN diff > Hdfs-raid.patch

In this way, all the files are put into patch.

Description: Assume that the following prompt appears when you hit Patch:

Hunk #1 succeeded at 1254 (offset lines). Hunk #2 succeeded at 1794 (offset lines).

Can participate in the http://blog.csdn.net/longerzone/article/details/16967579 to solve.

References Link:

Http://www.cnblogs.com/huang0925/p/3254243.html

http://zccst.iteye.com/blog/1765519

http://blog.csdn.net/longerzone/article/details/16967579

Copyright notice: This article blog original articles, blogs, without consent, may not be reproduced.

SVN in branch merger and Game Patch (1)