Re: Merging Trunk with a Branch

Binny V A wrote:

> I am the author of a GTD tool
> Nexty(http://sourceforge.net/projects/nexty). The repository is viewable
> at http://nexty.svn.sourceforge.net/viewvc/nexty/

Nice application!

> I tried using this command...
> svn merge https://nexty.svn.sourceforge.net/svnroot/nexty/branches/online
> https://nexty.svn.sourceforge.net/svnroot/nexty/trunk .
>
> But that merged all the changes - for example, it deleted the intro.php
> file which should be in the 'online' branch - but absent in the trunk.

You could merge only selected sub-directories rather than the whole
project-level directory. This would probably require you to reorganise your
directories such that the online version's modifications are in a separate
folder.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-07 07:02:11 CEST