[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-18 17:45:50 CET

On Wed, 2007-01-17 at 18:32 -0600, Ryan Schmidt wrote:
> 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.

----
thank you - this was exactly what I had to do - reverse merge the
changes and then merge them again and it worked.
I can't say what it was that was different from the first time I merged
and the second time except that the second time, I merged on my own
desktop system instead of a trunk checkout on the same machine that is
the svn server.
Merge looks good, committed changes, life is good again.
Thanks
Craig
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 18 17:46:24 2007

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