Announcement

Collapse
No announcement yet.

sourceURL to sourceURL Merging

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

  • sourceURL to sourceURL Merging

    Hi,
    I am trying to create a web page for users to be able to create a release by selecting files from a development repo which get automatically merged back into /trunk upon release creation. Then can later be merged into environment tags. I'm using PySVN to do the SVN manipulation.

    I'm running into a problem when trying to automatically merge /trunk into the dev branch (in case someone else made a change to trunk). If I were doing this all command line I'd just run "svn merge ^/trunk" but PySVN uses sourceURL to sourceURL merging. Essentially "svn merge file:///var/svnrepo/trunk file://var/svnrepo/branches/dev" If I have a file that was last modified in trunk and conflicts with my development copy the first command shows the conflict, the second just takes the trunk copy and clobbers the branches copy.

    Can anyone suggest how to construct the URL -> URL merge so that it shows the conflict?

    Thanks,
    John
Working...
X