[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: some issues with my merge

From: Craig White <craig_at_tobyhouse.com>
Date: 2007-01-17 18:18:31 CET

On Wed, 2007-01-17 at 10:09 -0700, Craig White wrote:
> On Wed, 2007-01-17 at 17:56 +0100, Méresse Christophe wrote:
> >
> > > -----Original Message-----
> > > From: Craig White [mailto:craig@tobyhouse.com]
> > > Sent: mercredi, 17. janvier 2007 17:28
> > > To: users@subversion.tigris.org
> > > Subject: some issues with my merge
> > >
> > >
> > > I merged a lot of code from a branch I started months ago into my main
> > > trunk. It all looked good on the dry run and I performed for real. I
> > > then checked out from my main trunk and there are clearly
> > > some files and
> > > folders missing in my main trunk that are in the branch and
> > > clearly were
> > > within the range of revisions that I merged.
> >
> > Yes, are you sure that they have been added in this range of revision ?
> > Else they will be skipped.
> >
> > > So if I update my local copy of a trunk with the missing files/folders
> > > from my last branch, each folder has a '.svn' directory which
> > > has to be
> > > purged before/after copying because if I don't purge it, it says that
> > > the files are already under version control.
> >
> > That's not a good idea to copy them like that. You will break the history of these files (they will be new files with an other history) and you will loose the advantage of svn cheap copy for these files.
> >
> > > So I'm wondering if there is a simpler way to get this missing files
> > > into my trunk.
> >
> > Try to understand the reason of this merge problem. It MUST work if you merge the good range of revision.
> ----
> 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.
>

----
I probably should point out that when I 'browse' the repository using
trac - looking through the 'trunk' the files that are missing are
showing up while browsing so at some level, svn thinks that these files
are there but doing a fresh checkout on the trunk, some of these files
just never show up.
Craig
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 17 18:18:56 2007

This is an archived mail posted to the Subversion Users mailing list.