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

I screwed something up trying to merge

From: Craig White <craig_at_tobyhouse.com>
Date: 2007-01-16 22:07:02 CET

I have a trunk, branches and tags

My 'trunk' is at version 49 and my branch 'phase3' is at tag 138

$ pwd
/home/app-serve/th-db # my phase3 branch

$ svn log --stop-on-copy
------------------------------------------------------------------------
r138 | app-serve | 2007-01-16 10:52:34 -0700 (Tue, 16 Jan 2007) | 1 line
<snippage>
r52 | craig | 2006-04-24 15:42:06 -0700 (Mon, 24 Apr 2006) | 1 line

I did a 'new' checkout of the trunk...

$ mkdir th-db_trunk
[app-serve@srv2 ~]$ svn checkout
file:///home/app-serve/svn/th-db/trunk /home/app-serve/th-db_trunk/
A /home/app-serve/th-db_trunk/test
<snippage>
A /home/app-serve/th-db_trunk/public/favicon.ico
Checked out revision 138.

and it checks out everything in the trunk but calls it revision 138 and
thus, when I do...

$ svn merge --dry-run -r 52:138 file:///home/app-serve/svn/th-db/trunk

it takes a second, reports nothing to the screen and thus, nothing is to
be done.

How do I merge all of the revisions back into the trunk?

-- 
Craig White <craig@tobyhouse.com>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 16 22:07:34 2007

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