Announcement

Collapse
No announcement yet.

Unable to merge branch to trunk

Collapse
X
  • Filter
  • Time
  • Show
Clear All
new posts

  • Unable to merge branch to trunk

    Hello, I would like merge branch to trunk and I do see a lot of difference in repository:

    Code:
    $ svn diff svn://192.168.1.4/KnowSG.com/trunk svn://192.168.1.4/KnowSG.com/branches/Hongliang.Wang
    
    Index: public_html/style.css
    ===================================================================
    2 files to edit
    Index: public_html/images/bg_container.png
    ===================================================================
    Cannot display: file marked as a binary type.
    svn:mime-type = application/octet-stream
    
    Property changes on: public_html/images/bg_container.png
    ___________________________________________________________________
    Added: svn:mime-type
       + application/octet-stream
    
    Index: public_html/en.lang.php
    ===================================================================
    2 files to edit
    Index: public_html/zh.lang.php
    ===================================================================
    2 files to edit
    Index: public_html/ChangeLog.txt
    ===================================================================
    2 files to edit
    Index: public_html/sample.php
    ===================================================================
    2 files to edit
    
    Property changes on: public_html/sample.php
    ___________________________________________________________________
    Added: svn:keywords
       + Author Date Id Revision
    Added: svn:eol-style
       + LF
    
    Index: steps/command_at_development.txt
    ===================================================================
    2 files to edit
    
    Property changes on: .
    ___________________________________________________________________
    Deleted: svn:mergeinfo
       Reverse-merged /KnowSG.com/branches/Hongliang.Wang:r308-344
    The working copy of trunk and branch are both at revision 345.
    Code:
    ~/branch $ svn info
    Path: .
    URL: svn://192.168.1.4/KnowSG.com/branches/Hongliang.Wang
    Repository Root: svn://192.168.1.4
    Repository UUID: ac145c16-7a16-464c-ab5e-d741deab7985
    Revision: 345
    Node Kind: directory
    Schedule: normal
    Last Changed Author: hongliang.wang
    Last Changed Rev: 343
    Last Changed Date: 2015-05-27 13:28:30 +0800 (Wed, 27 May 2015)
    
    ~/trunk $ svn info
    Path: .
    URL: svn://192.168.1.4/KnowSG.com/trunk
    Repository Root: svn://192.168.1.4
    Repository UUID: ac145c16-7a16-464c-ab5e-d741deab7985
    Revision: 345
    Node Kind: directory
    Schedule: normal
    Last Changed Author: hongliang.wang
    Last Changed Rev: 345
    Last Changed Date: 2015-05-27 14:08:03 +0800 (Wed, 27 May 2015)
    Then I executed svn merge because my svn version is 1.6
    Code:
    ~/trunk $ svn merge --reintegrate --accept=theirs-full ^/KnowSG.com/branches/Hongliang.Wang
    --- Merging differences between repository URLs into '.':
    U    sql/ChangeLog.txt
    U    sql/Makefile
       C html
       C perl/download_log.sh
    U    perl/export_monitor.pl
    U    perl/common.pm
    U    perl/ChangeLog.txt
       C perl/upload_source_code.sh
       C perl/new_version.pl
       C public_html
    U    config/subversion
       C config/development
    U    config/svndiffwrap.sh
    U    config/ChangeLog.txt
    U    config/production/hosts
    U    config/production/dovecot.conf
       C config/production/ssl.key
       C config/production/network
       C config/production/main.cf
       C config/production/sub.class1.server.ca.pem
       C config/production/ca.pem
    U    doc/work_flow.txt
    U    doc/infra.txt
       C Makefile
       C steps/command_at_development.txt
     G   .
    Summary of conflicts:
      Tree conflicts: 13
    ~/trunk $ $ svn status
     M      .
    !     C html
          >   local delete, incoming delete upon merge
          C perl/download_log.sh
          >   local add, incoming add upon merge
          C perl/upload_source_code.sh
          >   local add, incoming add upon merge
          C perl/new_version.pl
          >   local add, incoming add upon merge
          C public_html
          >   local add, incoming add upon merge
          C config/development
          >   local add, incoming add upon merge
    !     C config/production/ca.pem
          >   local delete, incoming delete upon merge
    !     C config/production/sub.class1.server.ca.pem
          >   local delete, incoming delete upon merge
          C config/production/ssl.key
          >   local edit, incoming delete upon merge
          C config/production/network
          >   local add, incoming add upon merge
          C config/production/main.cf
          >   local add, incoming add upon merge
          C Makefile
          >   local add, incoming add upon merge
          C steps/command_at_development.txt
          >   local add, incoming add upon merge
    After I solve those conflicts and commit changes into trunk, difference between branch and trunk still exist. Please help. Thanks.
Working...
X