M
M
missial2014-04-10 22:43:17
Python
missial, 2014-04-10 22:43:17

Merge operation using PySVN package - what could be the problem?

There is a branch https:/svn.somewhere.org/my_project/branches/1.0
I merge through the command line "svn merge https:/svn.somewhere.org/my_project/trunk"
Everything is fine, everything works.
There was a need to use the PySVN package for automatic merge.
Found an example, but, unfortunately, it does not work, as if I were doing the operation via cmd

def merge_to_wc(r):
  WC_PATH = '.'
  FROM_URL = 'https:/svn.somewhere.org/my_project/branches/1.0'

  pysvn.merge_peg(
    FROM_URL,
    pysvn.Revision(pysvn.opt_revision_kind.number, r-1),
    pysvn.Revision(pysvn.opt_revision_kind.number, r),
    pysvn.Revision(pysvn.opt_revision_kind.head),
    WC_PATH)

When performing the operation, it swears that there are conflicts, although they actually do not exist.

Answer the question

In order to leave comments, you need to log in

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question