The Explorer plain copy for that (in which case the destination file If you have to copy *between* working copies, you should really use Have just one WC that is switched between trunk/prjX and ![]() No, you don't have to check out the entire repository, you can even > can start officially supporting copying between WCs? > (user1/work-for-bug1), and I can't copy between WCs, I'd have to check out > This means, that if I am to copy files between trunk and my branch > /branches/users/user1/work-for-bug1/prj1 > using that very regularly! It's also the only convenient way I know for > What problems can I expect with copying files between WC's, because I am To: Re: Log/View Differences does not work for some copied files I guess, I could in my case just check out a copy of /branches/users/sunger, but I'm still curious, as to what problems you would expect when moving between WC's.įrom: Jean-Marc van Leerdam Wednesday, 5 July 2006 5:24 The way I'm doing the moves between the MergeTracker and NewInt5 branches is by having a working copy of each around and simply right-click-dragging and either moving or copy-renaming as appropriate. This works even if somebody renamed a file in /trunk which would otherwise cause changes I made to the file to be lost without warning. This way I (and everybody else) can always see, what parts of the code still need to be ported over (they are still present in the MergeTracker branch) and when I merge something into the MergeTracker branch, I know that I have to hand merge into the NewInt5 branch only the files that are marked Skipped in the merge log. Whenever I am bringing over another bit of code into my new branch, I move it from the MergeTracker branch into its new location. So what I did instead, is I set myself up another branch /branches/users/sunger/NewInt5_MergeTracker, and whenever I want to merge in things from /trunk, I merge them into the MergeTracker branch. Still hoping 'yet') tracks rename-operations properly. Tends to become rather unhelpful in that SVN does not (I'm If you do major rearrangements in a branch, the merge command To review each bit and refactor legacy complexities that are By moving code into the new branch bit by bit, I get a chance ![]() ![]() However, I didn't want to simply branch of /trunk and then start rearranging, for two reasons: Of course I want to do this work in a branch, so I set myself up a branch /branches/users/sunger/NewInt5. What I am doing at the moment is the following: I have started a rather major refactoring/re-layout of our projects, because of an upgrade of the embedded OS we are using. First of all, I do know of Merge, branch and tag commands etc. I would have expected the revision to be marked selected, as it is listed in the "specific range" edit.Sorry, that I did not explain myself clearly enough. The entered revision showed up when scrolling down, but So I clicked "Show all" with the "stop on copy" checkbox checked. As the entered revision number was about 500 revisions "older" than HEAD, actually, this revision was not shown in the log dialog initially. Then I opened the log dialog by clicking the "Show log"-button next to the "specific range" edit. In the appearing dialog I clicked the next-button (with "merge a range of revisions" selected) and then - in the step called "Merge revision range" - I selected the branch to merge from and entered one specific revision number below. ![]() I right-clicked on my trunk working copy in windows explorer and from the context menu I selected "merge".
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |