Would reintegration still work the 2nd time after 1st reintegration only commits a partial list of changes
Hi All We like to reintegrate from bracnh to trunk and for unclear reasons some files are touched that we dont want to get into the trunk so that seems to indicate that the server thinks the password is correct, but there's some other error going on if we do a few reverts of a few files and directories before the commit and after our commit rev X to the trunk, and suppose we like to reintegrate using the same branch to the trunk, would reintegrate still work even after we apply --record-only rev X; We ask because we read somewhere on stackoverflow that if we do that, when we need to perform reintegration because of "bad" merges, then this subset of files in first commit would cause problems in 2nd reintegration even after applying --record-only on the branch Is there a problem with my scenario ? Thanks Sincerely
code merging between branches question
Hi All We use SVN 1.6 We like to perform code merging between branches and we are in a dilemma situation. Branch A exists Folks making code changes on Branch A Branch B created from branch A Folks making code changes on both branches A and B Branch A sync code merging to Branch B After some time Branch C created from branch A Branch A continues sync code merging to Branch B (for a short time) Folks making code changes on Branch C Folks stop code changes on Branch A and branch "frozen", no more ci Folks making code changes on Branch B Branch C sync code merging to Branch B Folks making code changes on Branches B and C After some long period of time Now Dilemma: We like to merge Branch B to Branch C Because Branch B is from Branch A and not Branch C, we could not apply --reintegrate option for code merging from B to C because they don't share common ancestry What's the least risky way to merge (without the --reintegrate option) to prevent "double merges/duplicated code" of (C in B) into branch C ? Thank you Sincerely
Can svn merge --record-only be applied multiple times on a revision number
Hi All Would there be issues with SVN mergeinfo and/or SVN in general if one keeps applying svn merge --record-only on a revision number repeatedly and commit in a svn merge --record-only followed by commit followed by svn merge --record-only followed by commit and the next cycle begins ? It's not an infinite loop svn merge; it would stop at some point. Thank you Sincerely
How to revert a --record-only svn merge before a commit
Hi All We use SVN 1.6 How do we perform a svn merge "revert" of a revision number that is --record-only in linux shell before a svn commit ? We perform svn merge --record-only -c 1234 http://testsomething.com We like to revert that step. Thank you Sincerely
Can svn merge --record-only be applied multiple times on a revision number ? Any side effects ?
Hi All Are there side effects from applying the same svn merge --record-only on the same revision number and a new commit each time it is applied ? Would there be issues with SVN mergeinfo and/or SVN in general if one keeps applying svn merge --record-only on a revision number repeatedly and commit in a svn merge --record-only followed by commit followed by svn merge --record-only followed by commit and the next cycle begins ? It's not an infinite loop svn merge; it would stop at some point. Thank you Sincerely
how to svn merge with multiple revision numbers - quick question
Hi All We have a few revision numbers on trunk that we like to block but they are not in consecutive order - i.e. rev numbers 1,5,8,10,11 We like to merge from trunk to a branch but would like to block them on the branch. What's the correct syntax for svn merge --record-only ? Is it svn merge -c 1,5,8,10,11 --record-only trunk/directory or svn merge -r 1:11 --record-only trunk/directory Thanks
How to block code merge from another branch based on branch path - quick question
Hi All We like to block any code merges from branch A to branch B when someone makes changes to certain folders in branch A. In SVN, we learn that we could block using --record-only on branch B with revision number from branch A. How can we block based on branch A paths ? We ask because we like to find a way such that when someone changes branch A of the unwanted path, then the merge would be ignored and not merge to branch B because we don't want branch B to have changes from branch A on that branch A's source path. Advance thanks
how to svn merge of filename with spaces ?
Hi All We have SVN 1.6. We like to perform a svn merge on a file where its filename has spaces. eg Roaming Apple.txt Is this syntax correct below to svn merge to a working copy ? If not, what should it be ? svn merge -c 12345 "https://mytext.abb.com/app/path/to/Roaming Apple.txt" . using quotes? Right now, we get error svn: Unable to parse URL '/svn/app/!svn/bc/12576/path/to/Roaming Apple.txt using svn merge -c 12345 https://mytext.abb.com/app/path/to/Roaming Apple.txt . Any help is appreciated. Thank you
Fwd: how to svn merge of filename with spaces ?
Hi Brane Thanks for responding. How about svn merging between working paths if the paths have spaces ? eg svn merge -c 12345 src/path to/Roaming Apple.txt /src/another path/Roaming Apple.txt Thanks once again. On Tue, Jul 7, 2015 at 11:14 AM, Branko Čibej wrote: > On 07.07.2015 19:58, Zk W wrote: > > Hi All > > > > We have SVN 1.6. > > We like to perform a svn merge on a file where its filename has spaces. > > eg > > Roaming Apple.txt > > > > Is this syntax correct below to svn merge to a working copy ? > > If not, what should it be ? > > > > svn merge -c 12345 "https://mytext.abb.com/app/path/to/Roaming > > Apple.txt" . > > > > using quotes? > > > > > > Right now, we get error > > svn: Unable to parse URL '/svn/app/!svn/bc/12576/path/to/Roaming > Apple.txt > > using > > svn merge -c 12345 https://mytext.abb.com/app/path/to/Roaming Apple.txt > . > > > > Any help is appreciated. > > > You have to properly escape spaces (and other special characters) in an > URL. See, for example, > > https://en.wikipedia.org/wiki/Percent-encoding > > In your case, the URL would be > > https://mytext.abb.com/app/path/to/Roaming%20Apple.txt > > -- Brane >
