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

Re: I screwed something up trying to merge

From: Eric Hanchrow <offby1_at_blarg.net>
Date: 2007-01-16 23:33:59 CET

    $ 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?

You need to re-read the book chapter about merging --
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.wholebr

In the meantime, you must "cd" to a trunk working copy, and then do

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

-- 
 ハ  ハ
ミ^・^ミ
 `~~~´
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 17 00:28:52 2007

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