Re: I'd like to merge again.

On Jul 17, 2008, at 21:28, paptimusx wrote:

> with Ver1.5, I had merged trunk with the branch.
> and I did revert.
> How should I do to do the merging over again?
> It was not good in '-- force' option.
>
> thankx in advance.
>
> % svn --version | head -3
> svn, version 1.5.0 (r31699)
> compiled Jun 21 2008, 07:29:17
> % ver
> Microsoft Windows XP [Version 5.1.2600]
>
> on branch (branch off revision 9725)
>
> % svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ .
> G Makefile
>
> % revert Makefile

The merge not only changed the Makefile, but also changed properties
on the directory. You probably have to revert those as well.

% revert .

> retry
> % svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ .
>
> can't.
>
> % svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ . --
> force
>
> can't.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-18 07:04:10 CEST