svn - merging two subversion branches -

-

i found conflicting procedures:

subversion merging

  svn checkout http://a.b.c/bldtest1   cd bldtest1   svn merge -r45:50 http://a.b.c/bldtest2   svn merge -r53:55 http://a.b.c/bldtest2   svn ci -m "revision 45:50 , 53:55 merged"

merge between 2 branches in subversion

$ svn merge -r 127:240 svn+ssh://svn.myproject.org/svn/trunk .

which 1 of these right 1 ? opposite of each other. provided find set of revisions merged :

svn log --verbose --stop-on-copy  branch1 > log.txt

so in order merge branch1 branch2, we:

1. svn co branch1 3. cd branch1 4. svn merge -r xx:yy branch2

or

1. svn co branch1 2. svn co branch2 3. cd branch2 4. svn merge -r xx:yy branch1 .

these procedures are not conflicted: in first sample default target "." omitted

in order merge branch1 branch2

you have to:

read , understand svn book (link provided sameer)

use correct way of merging

svn co url/to/branch2 cd branch2 svn merge -r xx:yy url/to/branch1

and, btw, cherry-pick merging isn't best merging in world


Comments

Post a Comment

Popular posts from this blog

javascript - Count length of each class -

-
i have below code in this fiddle . html <span class="myname">john smith</span> <span class="myname">john smith</span> <span class="myname">john smith</span> <span class="myname">john smith</span> <span class="myname">john smith</span> <span class="myname">john smith</span> javascript $('.myname').each(function(){ var text = $(this).html().split(' '), len = text.length, test = $(this).val().length, result = []; console.log('outside: ' + test); for( var = 0; < len; i++ ) { result[i] = '<span class="name-'+[i]+'" >' + text[i] + '</span>'; console.log('inside: ' + test); } $(this).html(result.join(' ')); console.log('after
Read more

What design pattern is this code in Javascript? -

-
this question has answer here: why write “.call(this)” @ end of javascript anonymous function? [duplicate] 4 answers what kind of design pattern , significance of using closure? (function(){ // code here }).call(this); edit then difference between above code , following this keyword still refer same object in both ways. (function(){ // code here })(); thats invoked function expression. more info here: http://benalman.com/news/2010/11/immediately-invoked-function-expression/ the purpose run code while protecting scope (so variables declared within don't leak out global scope. update call sets value of this function being applied on. without it, value set window object, there set outer scope.
Read more

hadoop - Restrict secondarynamenode to be installed and run on any other node in the cluster -

-
i have have cloudera cdh3u4 cluster setup. have secondarynamenode daemon running on 1 of nodes. i have ensure user has root access node on cluster (for example, datanode not have other daemons running) should not able start instance of secondarynamenode daemon on node (thereby having 2 secondarynamenodes on cluster) how can achieve this? thanks in advance. add property hdfs-site.xml namedfs.secondary.http.address valuesecondarynamenode-host address or ip:50090
Read more