[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

I'd like to merge again.

From: paptimusx <paptimusx_at_gmail.com>
Date: Fri, 18 Jul 2008 11:28:18 +0900

Hi! there.

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

% svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ .


% svn merge -r9725:HEAD http://server/svn/PROJECT/SRC/trunk/S/ . --force


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 04:28:54 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.