StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<blockquote> <p>Is there a way of merging in only the specific changes I want from a specific revision?</p> </blockquote> <p>If you don't want a full revision, I would copy over what you want manually by creating a patch file and applying it to the other branch and committing. That way, instead of subversion skipping that revision later (when you reintegrate the branch), it tries to merge it and you just deal with an ordinary conflict on what you manually copied, but it also merges over the part you originally wanted to skip.</p> <p>In the case of a file create/delete/add, it would create it at the time of reintegration and avoid your tree conflict, since that 'partial revision' you want wasn't ever officially merged.</p> <p>In the case where no file was created/deleted/moved, you avoid the potential of forgetting that you excluded part of your revision when you merged it previously.</p> <p>Following the above prevents your next one: </p> <blockquote> <p>Is there any way of grabbing the changes I deliberately missed when I re-integrate the entire branch?</p> </blockquote> <p>If you don't merge a partial revision, there won't be anything deliberately excluded recorded by subversion and you should just have an ordinary conflict to deal with on the portion already copied over. </p> <p>In your case you may be able to tell subversion to merge that individual revision again, doing the reverse of what you previously did (resolving conflict on or reverting the part you originally wanted, while keeping the part you originally left out), but I'm not sure how this works once the merge has already been recorded.</p> <p>Alternatively, if you use TortoiseSVN you should be able to select the revision in the log (on your feature branch), right click the file(s) you care about that were modified as part of that revision, and "show changes as diff", save that, and apply it manually back to trunk (or whichever branch is the target of our reintegrate branch).</p> <blockquote> <p>Could I create the directory structure I need in the trunk and then merge over only the file changes?</p> </blockquote> <p>Try it out and see. At worst, you checkout another workspace or manually fix the contents of the file (in the event that it skips it)</p> <blockquote> <p>Can I create another branch, move the required changes over there, reintegrate that branch and then pull from the trunk to my original branch?</p> </blockquote> <p>Now you're just making my head hurt :) Fixing it manually sounds like less work to me. I would fix the part you excluded on trunk and then retry reintegrating the branch.</p> <p>Hopefully some part of this is helpful.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload