Hi Alex,
> Hi All,
>
> I have a newbie question.
> I have a repository which looks loke this:
>
> Server/projektName/trunk/
> Server/projektName/branch/NiceBranchtoDevelop
>
> Now i changed my Branch (2 Commits meanwhile). Now i tried to merge to
> branch down to the trunk.
> It seemed to be successfull, but when i now check my trunk, the
> changes which i made in my branch dont appear ???
>
> I have to WC's on my HDD:
> P:ProjektNameTrunk/
> P:ProjektNameSuperbranch/
>
> How can i do this?
You have to do a merge in the target directory, with the difference of
your branch right before the modifications and the branch as it is now.
Like this:
$ cd trunk
$ svn merge -r REV1:REV2
http://Server/projectName/branch/NiceBranchtoDevelop
Something similar to that should work for you. If you need more info,
try taking a look at the section on merging in the Subversion book.
As a tip for the future: the more information you provide in your
emails to the mailing list, the easier it is for people to help you
out. In this case, it would have been a lot easier to give you
detailed information on what you're doing wrong if you'd provided some
information about exactly what command you ran to do the merge. As it
stands, I can only guess at what you did wrong.
Hope that helps,
Bill
>
>
> Thanks Alex
>
> ---------------------------------------------------------------------
> 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 Thu Dec 23 19:19:16 2004