Re: some issues with my merge
From: Craig White <craig_at_tobyhouse.com>
Date: 2007-01-18 00:07:24 CET
On Wed, 2007-01-17 at 14:39 -0600, Ryan Schmidt wrote:
---- you're correct and I was wrong...the files that are not part of a fresh check out are NOT visible in Trac either. There are files from revision 67 that are included in a fresh checkout of trunk (and visible in Trac) and files from that same revision that aren't included in a fresh checkout of trunk (and likewise NOT visible in Trac). I presume that this same thing has happened on other revisions since the branch went from revision 52 through 138 (almost 6 months), and it seems as though it wasn't entirely predictable which files are missing from trunk. I guess I have to figure out how to deal with a merge that should have included all of the revisions that fell within the range of revisions that were merged but didn't merge. Is it possible to merge again? I ask because subsequent efforts to merge the same thing doesn't seem to change anything. A fresh checkout of the branch has all the files, a fresh checkout of the trunk is missing files and the merge that I performed should have included all of the files from the branch into the trunk as I understand it. Any / all suggestions are welcome but it appears that I will have to simply grab files/folders from the branch and copy them into my trunk checkout, add them in again to make trunk complete as I can conceive of no other way to fix this. Craig --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org For additional commands, e-mail: users-help@subversion.tigris.orgReceived on Thu Jan 18 00:07:55 2007 |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.