svn 分支上新增文件合并发生冲突_SVN合并和树冲突“本地添加,合并时传入添加”...

# Normal SVN Structure

svn-testing2> ls -l

total 12K

drwxrwxr-x 3 xxx yyy 4.0K Jan 13 17:28 branches/

drwxrwxr-x 3 xxx yyy 4.0K Jan 13 17:28 tags/

drwxrwxr-x 3 xxx yyy 4.0K Jan 13 17:28 trunk/

# Create & commit some data

svn-testing2> echo "line1" > trunk/file1; svn add trunk/file1; svn commit -m "created file1 " trunk/file1

Adding trunk/file1

Transmitting file data .

Committed revision 2.

# Create the release branch

svn-testing2> svn copy trunk branches/release

A branches/release

svn-testing2> svn commit -m "created release branch" branches/release

Adding branches/release

Adding branches/release/file1

Committed revision 3.

# Make & commit a change to trunk

svn-testing2> echo "line1-file2" > trunk/file2; svn add trunk/file2