SVN Merge questions

Gidday SVNers,

svn, version 1.4.4 (r25188)
   compiled Jul 19 2007, 10:47:50
(Solaris).

The following SVN Merge behaviour seems wrong. Schenario:

* rev 20 - merge commit from branches/bsmith to trunk
* rev 21 - branches/bsmith - I performed some deletes and adds.
* rev 22 - branches/other_person - some changes

I want to merge from my branch to trunk:
* cd trunk_working_copy
* svn merge --dry-run r:21:22 $REPO/branches/bsmith

Nothing happens (no output).

Try:
* svn merge --dry-run r:20:22 $REPO/branches/bsmith

Works and merges changes at rev21. Why. Doesn't "r 21:22" mean all changes from rev 21 to rev 22? So r 20:22 means all changes including 20, 21 and 22.

Secondly, when you merge should you avoid where you have merged before? As in the above scenario I would have thought I wouldn't want r:20:22.

I'm not on users_at_subversion.tigris.org and would appreciate if you could CC any replies to me also (I'm CC'd).

Thanks,

Brooke
------------------------------------------------------
            Brooke Benjamin Oehm Smith
Technical Publishing Development Team Lead
      Product Support Group, Operations
               Boeing Australia Limited
                   +61 7 3306 3335

The environment should be put in the category of our national security. Defense of our resources is just as important as defense abroad. Otherwise what is there to defend? ~Robert Redford, Yosemite National Park dedication, 1985

P Please consider the environment before printing this email.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-02-25 13:10:40 CET