Announcement

Collapse
No announcement yet.

svn merge --reintegrate (Question)

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

  • svn merge --reintegrate (Question)

    All:

    Method 1:
    svn merge --reintegrate mybranch

    Methd 2:
    svn merge ^/trunk@N ^/branches/mybranch@M
    where "N" stands for the revision that "mybranch" was rebased to trunk
    and "M" stands for the current (latest) version of <mybranch>

    The above 2 methods give the correct results when invoked from
    a woking copy of the trunk. ( No GUI; all on commandline)

    My questions are :
    1) How to determine the values of "M" and "N"
    2) Is it possible to determine values of "M" and "N" using the first method ( --reintegrate option)

    Thanks in advance
    bsoo

  • #2
    I don't see any way to detemine M and N using merge command, you need to examine the logs to get the copy-of revisions.
    I haven't tried this myself, but I think this is what svn merge info --show-revs eligible should be doing.

    Comment


    • #3
      Hi Rahul:

      Thanks for your reply. I will try to look at "svn log" and "svn mergeinfo".

      Regards,
      bsoo

      Comment

      Working...
      X