version control - SVN branch to trunk merge doesn't work, only shows "property changes", not code changes -


i have svn 1.6.11 , trying merge mybranch onto trunk. have tried both 

svn merge --reintegrate http://ip/path/to/repo/branches/mybranch http://ip/path/to/repo/trunk   svn ci -m "blah"

and 

svn merge http://ip/path/to/repo/branches/mybranch http://ip/path/to/repo/trunk   svn ci -m "blah"

they both gave me after merge:

$ svn diff  property changes on: . ___________________________________________________________________ modified: svn:mergeinfo    merged /repo/trunk:r23

and after commit:

sending        trunk

i not see changes in trunk. when diff trunk version before merge (18) latest version (24), get: 

$ svn diff -r 18:24  property changes on: . ___________________________________________________________________ added: svn:mergeinfo    merged /repo/trunk:r20-23

i don't want property changes. want code changes merged. did wrong?

  1. make sure changes committed on branch, in development directory svn commit -m "etc commits"
  2. merge changes in trunk branch, i test @ point, , recommit on branch @ point. svn merge http://ip/path/to/repo/trunk ., testing, svn commit -m "merged trunk , passed tests
  3. check out trunk - svn co http://ip/path/to/repo/trunk
  4. merge branch trunk in working copy of trunk svn merge --reintegrate http://ip/path/to/repo/branches/mybranch .
  5. testing, more testing, yet more testing!!!
  6. commit on trunk: svn commit -m"my feature merged in"
  7. get ready bug reports problems all tests missed.

n.b. svn documentation mentions 2 url or server side merges - "say possible difficult don't try unless really know doing"


Comments

Post a Comment

Popular posts from this blog

c# - Send Image in Json : 400 Bad request -

from android trying send image class of data, iis webservice. (c#) the problem 400 bad request . the image being encoded base64 . , placed json rest of class elements. my guess base64 not valid inside json. server not understand it. if set string "" , post accepted fine. so question is, how make base64 valid within json array? ( tried url.encode no success). or how should send image android webservice? gson gson = new gson(); string json = gson.tojson(record); // record has param { string base64photo } how big image? i'm pretty sure surpassing iis json size limit (default 4 mb). check http://geekswithblogs.net/frankw/archive/2008/08/05/how-to-configure-maxjsonlength-in-asp.net-ajax-applications.aspx or http://www.webtrenches.com/post.cfm/iis7-file-upload-size-limits good luck!
Read more

javascript - addthis share facebook and google+ url -

i attempting use addthis create simple url shares whichever current page user on when click share button. of right now, have twitter working. when user clicks, able see url populated in tweet box. when user clicks facebook or google+, url doesn't seem show in share box. <ul class="addthis_toolbox addthis_default_style "> <li><a class="addthis_button_facebook"><img src="/img/facebook-social.png" width="20" height="20" border="0" alt="share" /></a></li> <li><a class="addthis_button_twitter"><img src="/img/twitter-social.png" width="20" height="20" border="0" alt="share" /></a></li> <li><a class="addthis_button_google_plusone_share"><img src="/img/google-social.png" width="20" height="20" border="0" alt="s...
Read more

ios - Show keyboard with UITextField in the input accessory view -

i have buttona , when buttona clicked, want keyboard show uitextfield in inputaccessoryview. there way have keyboard show manually , set inputaccessoryview without having uitextfield initially? thanks. you cannot summon keyboard without object can become first responder. there 2 ways work around: subclass uiview , implement uikeyinput protocol in it. example: in .h file: @interface inputobject : uiview<uikeyinput> @property (nonatomic, copy) nsstring *text; @property (nonatomic, strong) uiview *inputaccessoryview; // must override inputaccessoryview , since it's readonly default @end in .m file, implement protocol: - (bool)canbecomefirstresponder { return yes; } - (bool)hastext { return [self.text length]; } - (void)inserttext:(nsstring *)text { nsstring *selftext = self.text ? self.text : @""; self.text = [selftext stringbyappendingstring:text]; [[nsnotificationcenter defaultcenter] postnotificationname:kinputobjec...
Read more