[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: Méresse Christophe <christophe.meresse_at_nagra.com>
Date: 2007-01-17 17:56:50 CET

> -----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.

Regards
Christophe

> --
> Craig White <craig@tobyhouse.com>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 17 17:57:23 2007

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