Results 1 to 2 of 2

Thread: 1.4 merge

  1. #1

    1.4 merge

    I'm working with a version 1.4 server & client (unfortunately).

    And I'm trying to merge trunk changes into a working copy of a branch. The 1.5 svnbook gives this command:

    % svn merge http:/.../repos/trunk

    However this will not work for me with 1.4. 1.4 requires from & to revisions to be specified with -r FROM:TO. However, peeking at the help pages gives some keywords. Is this command equivalent to the 1.5 merge?

    % svn merge -r BASE:HEAD http:/.../repos/trunk

    In this case BASE is the last revision of my branch's working copy and HEAD is the latest revision of trunk. This should take all the changes to trunk since my last merge. Am I correct in this? (I'm trying to avoid having to keep track of the last merge revision numbers.)

  2. #2
    Senior Member
    Join Date
    Jan 2005
    Location
    Würselen - Germany
    Posts
    1,150
    Hi,

    if you need to work with 1.4.X you have to track the revisions or revision ranges you merged your self. There is no other solution for that.
    The best practice was to do that in the Log Message.
    Code:
    - Merged Revisions r134:r230 from branches/B_134
    I worked a long time with such kind of things and it worked well.

    The next thing is you need to think about which revisions you like to merge.

    Code:
    svn merge BASE:HEAD URL/trunk
    is NOT equivalent to the svn merge of Subversion 1.5/1.6...in 1.5/1.6 svn merge tracks the revisions which had been merged automatically.

    So on the other hand BASE references the revision in your working copy whereas HEAD refers to the newest revision of the repository (Revision Keywords).

    Kind regards
    Karl Heinz Marbaise

Similar Threads

  1. Merge or Merge reintegrate
    By ebonharme in forum Version Control Practices
    Replies: 3
    Last Post: 05-17-2010, 02:02 PM
  2. Why merge command format changes merge behavior?? PLZ HELP!!
    By firstenburg in forum Version Control Practices
    Replies: 2
    Last Post: 08-08-2009, 08:33 AM

Bookmarks

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •