You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Patrick Mayweg <ma...@qint.de> on 2003/02/12 07:31:09 UTC
Question how to merge.
Hi,
I have created a branch in my svn-repository. Since I am thru with my
work on the branch, I want to merge my changes into the trunk. How do I
do that? I do now remember the revision number when I created my branch.
Reading the fine svn book, did not give me any ideas, because all the
merges there were in the form with revision numbers.
Patrick
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Question how to merge.
Posted by Michael Wood <mw...@its.uct.ac.za>.
On Wed, Feb 12, 2003 at 08:31:09AM +0100, Patrick Mayweg wrote:
> Hi,
> I have created a branch in my svn-repository. Since I am thru with my
> work on the branch, I want to merge my changes into the trunk. How do
> I do that? I do now remember the revision number when I created my
> branch.
Should that be "I do NOT remember...?"
Maybe "svn log -v file:///path/to/branch" would help? It should show
in which revisions copies happened.
--
Michael Wood <mw...@its.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Question how to merge.
Posted by Ben Collins-Sussman <su...@collab.net>.
Patrick Mayweg <ma...@qint.de> writes:
> Reading the fine svn book, did not give me any ideas, because all the
> merges there were in the form with revision numbers.
That's because you have to specify what you want to merge.
A merge command requires
* two sources to compare
* a wc target to apply diffs to
The 'sources' must be revision/path pairs. You can specify them
explicitly, like
svn merge URL1@X URL2@Y wc
Or they can be both implicitly be HEAD:
svn merge URL1 URL2 wc
Or they can be specified like
svn merge -rX:Y URL wc
svn merge -rX:Y wcpath wc
*You* have to keep track of the revisions. You need to remember (or
ask 'svn log') which revision your branch was created in. Assuming
it was created in revision 100, you'd run
svn merge -r100:HEAD BranchURL wc
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org