Announcement

Collapse
No announcement yet.

Reinterate one brach (branch B) to branch A,( which acts as trunk)

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

  • Reinterate one brach (branch B) to branch A,( which acts as trunk)

    I am trying to reintegrate the branch B to branch A. Getting the following error where the SoftCore_trunk_debug is branch A and cx_dia is branch B.

    [root@localhost SoftCore_trunk_debug]# svn merge --reintegrate svn://192.168.20.3/Projects/SoftCore/branches/Pri/cx_dia .
    svn: E195016: Reintegrate can only be used if revisions 20221 through 20559 were previously merged from svn://192.168.20.3/Projects/SoftCore/branches/V3_Trunk to the reintegrate source, but this is not the case:
    Projects/SoftCore/branches/Pri/cx_dia/src/ransrc/CMMERec.cpp
    Missing ranges: /Projects/SoftCore/branches/V3_Trunk/src/ransrc/CMMERec.cpp:20446-20447
Working...
X