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

c# - SelectList with Dictionary, add values to the Dictionary after it's assigned to SelectList -

-
i have following code - dictionary<string, string> mydict = new dictionary<string, string>(); mydict.add("keya", "valuea"); mydict.add("keyb", "valueb"); ienumerable<selectlistitem> myselectlist = new selectlist(mydict, "key", "value") further down in program, want add values mydict . possible? if yes, how? want - myselectlist.mydict.add("keyc", "valuec"); if you're wanting add items mydict, possible, , changes reflected in of myselectlist 's enumerations long changes made before enumeration (e.g. using .tolist() ) generated. as worked example: dictionary<string, string> mydict = new dictionary<string, string>(); mydict.add("keya", "valuea"); mydict.add("keyb", "valueb"); ienumerable<selectlistitem> myselectlist = new selectlist(mydict, "key", "value...
Read more

how can i manage url using .htaccess in php? -

-
i want manage url of website right showing me www.computermall.co.in/product_details.php?prdid=34 but want www.computermall.co.in/product_details/34 how can it? i have tried this options +followsymlinks -multiviews rewriteengine on rewritebase /computermall # uri-path directly the_request variable rewritecond %{the_request} ^(get|head)\s/(.*)\.php [nc] # strip extension , redirect permanently rewriterule .* /%2 [r=301,l,nc] rewritecond %{request_filename} !-f rewritecond %{request_filename} !-d rewritecond %{request_uri} !\.php [nc] # map internally original resource rewriterule ^(.*)$ $1.php [l,qsa] try this: rewriteengine on rewriterule ^product_details/prdid/([^/]*)$ /product_details?prdid=$1 [l] edit: removed leading slash
Read more

ios - I get the error Property '...' not found on object of type '...' -

-
appdelegate.h #import <uikit/uikit.h> @interface appdelegate : uiresponder <uiapplicationdelegate> @property (strong, nonatomic) uiwindow *window; @end appdelegate.m #import "appdelegate.h" #import "firstviewcontroller.h" #import "secondviewcontroller.h" @implementation appdelegate - (bool)application:(uiapplication *)application didfinishlaunchingwithoptions: goes on normal app.......... @end firstviewcontroller.h #import <uikit/uikit.h> @interface firstviewcontroller : uiviewcontroller @property (strong, nonatomic) iboutlet uiimageview *bground; - (ibaction)settingspressed:(id)sender; - (ibaction)startpressed:(id)sender; @end @class secondviewcontroller; @interface secondviewcontroller : uiviewcontroller @property(strong,nonatomic)secondviewcontroller *secondviewcontroller; @end firstviewcontroller.m #import "firstviewcontroller.h" @interface firstviewcontroller () @end @implement...
Read more