Announcement

Collapse
No announcement yet.

How to --record-only merge using a revision range

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

  • How to --record-only merge using a revision range

    Hi there


    I have been Googling for --record-only merge info. but am stuck with an issue I have.
    I have a branch that keeps moving and which I need to do repeated re-integrations to its source branch (trunk).

    When attempting repeated re-integrations I am doing a --record-only merge of trunk to branch to bring branch up to date with trunks latest revision (created from last re-integration).
    But I am getting an error when attempting the re-integration merge:

    Code:
    Merge status operation failed.
    svn: Reintegrate can only be used if revisions 1208 through 2553 were previously merged from ^svn/trunk to the reintegrate source, but this is not the case:
    When I look at the mergeinfo on the branch it reads:
    /trunk:1208-2548,2553

    The --record-only merge tacked the 2553 changeset on the end but this does not satisfy SVN which needs to see the range extending to the HEAD of the trunk, ie.:
    /trunk:1208-2553

    Is there any way I can do a --record-only merge to extend the range rather than just tack the revision on the end?
    I cannot seem to find the sytax for doing the record only merge with revision range.


    cheers
    Jon
Working...
X