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
$ svn log --stop-on-copy
I did a 'new' checkout of the trunk...
$ mkdir th-db_trunk
and it checks out everything in the trunk but calls it revision 138 and
$ 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
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.orgReceived on Tue Jan 16 22:07:34 2007 |
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.