RE: Re: Log/View Differences does not work for some copied files
From: <SebastianUnger_at_eaton.com>
Date: 2006-07-06 01:45:20 CEST
Sorry, that I did not explain myself clearly enough. First of all, I do know of Merge, branch and tag commands etc. I use them almost daily.
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. Of course I want to do this work in a branch, so I set myself up a branch /branches/users/sunger/NewInt5. However, I didn't want to simply branch of /trunk and then start rearranging, for two reasons:
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. Whenever I am bringing over another bit of code into my new branch, I move it from the MergeTracker branch into its new location. 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. 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.
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. So far it has worked just fine.
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.
Seb
-----Original Message-----
Sebastian,
On 05/07/06, SebastianUnger@eaton.com <SebastianUnger@eaton.com> wrote:
No, you don't have to check out the entire repository, you can even
If you have to copy *between* working copies, you should really use
What are you trying to achieve with your current copying of files?
If you are you trying to bring trunk up to date with work done on the
If you are you setting up a new bug branche to start working on a fix,
-- Regards, Jean-Marc ---------------- ___ // \\ @@ "De Chelonian Mobile" / \_/ \/._) TortoiseSVN <\_/_\_/ / The coolest Interface to (Sub)Version Control /_/ \_\ Check out http://tortoisesvn.org --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org For additional commands, e-mail: users-help@tortoisesvn.tigris.org --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org For additional commands, e-mail: users-help@tortoisesvn.tigris.orgReceived on Thu Jul 6 01:45:34 2006 |
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.