SVN: Branch and reintegrate is not working with updated server

后端 未结 3 664
没有蜡笔的小新
没有蜡笔的小新 2020-12-11 05:22

I am working with a Subversion server that was recently upgraded to version 1.7. I am using the command-line Linux client 1.7.10.

I created a branch like this:

相关标签:
3条回答
  • 2020-12-11 06:03

    If you are on IntelliJ 13.1 (Build #IU-135.475) and having this problem and your server is not 1.7x yet simply go to your Subversion preferences, presentation tab, un-tick 'Show merge source in history and annotations'.

    0 讨论(0)
  • 2020-12-11 06:05

    Upgrade remote repository, not personal checkout (take few seconds):

    $ svnadmin upgrade REPOS_PATH
    

    If you worry or have no remote access for converting - dump or sync repository copy by:

    $ svnsync initialize --username=XXX --password=YYY $MIRROR $MASTER
    $ svnsync synchronize $MASTER
    

    or:

     $ svnadmin dump $MASTER  > svn.dump
    
    0 讨论(0)
  • 2020-12-11 06:15

    Two notes:

    • ^ in SVN-path means always repository-root, thus ^/c/branches/ovm_sequencer implies "/c/branches/ovm_sequencer" inside repository, while you have (most probably) repository in acme.com/a/b/c path, and URL must be ^/branches/ovm_sequencer

    • "Retrieval of mergeinfo unsupported" means one bad fact about your Network|SVN admin - he doesn't read Release Notes for updated software: in order to have mergeinfo supported on server side except updating software for pre-1.5 Subversion to 1.5 or later, repository also must to be upgraded in order to have new format. Topic (very old - from 2008 year) on Collabnet "mergeinfo not supported"

    0 讨论(0)
提交回复
热议问题