Re: Need some help with merging/vendor branches

Janine Sisk wrote:

> - svn
> merge file:///svnrepos/dodss/vendor/openacs/initial-rev file:///svnrepos/dodss/vendor/openacs/current
>

I think the above merge command is reversed?

it should be:

  svn merge .../current .../initial-rev

> This was clearly not right as all the files I've added to the trunk have
> been deleted from my working copy. Looking over the steps I think I
> understand the problem... because the trunk was not created as a copy of
> current, as it is in the book, there's no connection between the two and
> my changes weren't included when I ran svn_load_dirs.pl.
>
> My question, then, is what to do now? My guess is to delete the current
> directory I created above and recreate it as a copy from the trunk at
> the latest version, then re-run svn_load_dirs.pl to merge openacs-5.4-2
> into that. Then do the merge into my working copy from initial-rev and
> current. Is that right?

If you didn't do "svn commit" , then you can simply issue "svn revert"

If you have already committed your merge, you can use merge again to
undo changes.

The subversion book describes it quite well, see:

http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-17 08:44:49 CEST