![]() ![]()
![]() You should select "Compare whitespaces", unless you want to ignore these changes (not recommended). #Tortoisesvn does not copy log when branch full#Normally you would want to apply the changes to the full "working copy", so choose this. In this last dialog, choose the "merge depth", that is what parts of your local copy are to be changed. It normally ends with the head revision, but in this case we choose a lower revision (36800) first. Remember that when using Tortoise SVN, the revision range begins with the last revision that has not been merged. We have already found the revision range above, so just enter it into the Revision field. If it's not already selected in the "from" field, click on the "." right to the text field and select it from the repository. In this example we want to sync from trunk into the branch, so in the "URL to merge from" field we select trunk, or more exactly the reactos subfolder of trunk, because in this case the local copy is the reactos subfolder of the ros-amd64-bringup branch and we don't care for the other subfolders. Normally you will use the "Merge a range of revisions". Right click on the destination branch in explorer, select "TortoiseSVN", then "Merge.". ![]() In this example we choose revision 36800. The ending revision would normally be the head revision of the source branch/trunk. If no sync has been done yet, choose the branching revision. This should be noted in the commit log of the last sync. With TortoiseSVN you would merge 100-200 this time and 201-300 next time. For example, if you are merging revisions in chunks, the method shown in the subversion book will have you merge 100-200 this time and 200-300 next time. Note that when using the command line client, the starting revision is the same as the last revision that was merged into the branch / into trunk. The range typically starts with the first revision since the last merge was performed. You need to know the revision range that you want to merge.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |