RE: some issues with my merge
From: Craig White <craig_at_tobyhouse.com>
Date: 2007-01-17 18:09:18 CET
On Wed, 2007-01-17 at 17:56 +0100, Méresse Christophe wrote:
---- I am quite sure that the missing files were within the range of my merge...this was my merge: svn merge --dry-run -r 52:138 svn +craigssh://app-serve@srv2.tobyhouse.com/home/app-serve/svn/th-db/branches/phase3 merged from 52 through 138 now in my newly checked out trunk, just one example directory...(blank lines removed) $ ls -l lib total 4 drwxr-xr-x 3 craig users 4096 Jan 17 09:01 tasks sh-3.1$ cat lib/.svn/entries 8 dir 139 svn +craigssh://app-serve@srv2.tobyhouse.com/home/app-serve/svn/th-db/trunk/lib svn+craigssh://app-serve@srv2.tobyhouse.com/home/app-serve/svn/th-db 2006-04-01T20:15:57.827571Z 29 craig svn:special svn:externals svn:needs-lock 5b32b4dd-9b0e-0410-8e92-bc10be88a350 tasks dir and from my branch that was the source of all activity from revision 52 through 138 and merged to the trunk per above... $ ls -l lib total 24 -rw-r--r-- 1 craig users 392 Jan 4 15:17 clwholename.rb -rw-r--r-- 1 craig users 397 Jan 4 15:17 cmwholename.rb -rw-r--r-- 1 craig users 393 Jan 4 15:17 pewholename.rb -rw-r--r-- 1 craig users 173 Jan 4 15:17 session_cleaner.rb -rw-r--r-- 1 craig users 393 Jan 4 15:17 suwholename.rb drwxr-xr-x 3 craig users 4096 Jan 4 15:17 tasks #### Note all the 'rb' files that are missing in 'trunk' sh-3.1$ cat lib/.svn/entries 8 dir 138 svn +craigssh://app-serve@srv2.tobyhouse.com/home/app-serve/svn/th-db/branches/phase3/lib svn+craigssh://app-serve@srv2.tobyhouse.com/home/app-serve/svn/th-db 2006-10-25T01:29:45.955922Z 110 craig svn:special svn:externals svn:needs-lock 5b32b4dd-9b0e-0410-8e92-bc10be88a350 clwholename.rb file 2007-01-04T22:17:46.000000Z 265ec5e0e9349a4a3aca1fb48cf121e3 2006-09-09T12:50:17.098339Z 67 craig cmwholename.rb file 2007-01-04T22:17:46.000000Z d478d457ade5e3a68715959a5aa651fe 2006-09-09T12:50:17.098339Z 67 craig tasks dir pewholename.rb file 2007-01-04T22:17:46.000000Z 7cbf235de0e51814038b84ca73a41684 2006-09-09T12:50:17.098339Z 67 craig suwholename.rb file 2007-01-04T22:17:46.000000Z 291075efa1fe6cb88d570915b72589de 2006-09-09T12:50:17.098339Z 67 craig session_cleaner.rb file 2007-01-04T22:17:46.000000Z 0292f4d83293a96b274f5584aa753cd5 2006-10-25T01:29:45.955922Z 110 craig ### so you can see that the missing files (in this case seem to be from revision 67 but there are other files missing from other revisions also within the 52:138 range that I merged (without error) into the trunk. Many of the files within that range did successfully merge. I am confused but I need to fix this to move on. Thanks Craig --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org For additional commands, e-mail: users-help@subversion.tigris.orgReceived on Wed Jan 17 18:09:51 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.