[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: Ryan Schmidt <subversion-2007a_at_ryandesign.com>
Date: 2007-01-18 01:32:35 CET

On Jan 17, 2007, at 17:07, Craig White wrote:

> Is it possible to merge again? I ask because subsequent efforts to
> merge
> the same thing doesn't seem to change anything.

If you believe your revision 139 was erroneous, you can undo it by
performing a reverse merge. The book shows how:

http://svnbook.red-bean.com/en/1.2/
svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo

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

svn merge works correctly. You just have to tell it the correct thing
to merge. Try undoing 139 by performing a reverse merge as described
in the book. Then try doing the merge again. Do not commit it
immediately after that; first examine your working copy to see if the
correct changes have been performed. If not, tell us again exactly
what commands you did, and what you were trying to do.

-- 
To reply to the mailing list, please use your mailer's Reply To All  
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 18 01:33:05 2007

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