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

FAQ correction

From: Andrew Pimlott <andrew_at_pimlott.net>
Date: 2004-07-25 05:05:22 CEST

I believe an important step is omitted from the answer to FAQ 36, "I
can't use tags to merge changes from a branch into the trunk like I used
to with CVS, can I?"[1]. After the merge, bar_last_merge should up
updated to reflect the merge. AFAIK, the best way to do this is

    svn delete file:///home/repos/tags/branch_traces/bar_last_merge
    svn copy file:///home/repos/branches/bar_branch \
        file:///home/repos/tags/branch_traces/bar_last_merge \
        -m "merged rNNN to trunk"

Is my understanding correct?

Andrew

[1] http://subversion.tigris.org/project_faq.html#merge-using-tags

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jul 25 05:17:39 2004

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