You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Lakshman Srilakshmanan <la...@tradingpost.com.au> on 2006/01/04 06:59:07 UTC
Merge from trunk head
Hi All,
Happy New Year to you all.
Could you please review the following and provide me with you valuable
response.
I have
------
/repository/project1
/trunk
/branch
To merge all the change in trunk@HEAD into branch@HEAD can I do the
following.
svn co svn://<host>/project1/branch my-branch-copy
cd my-branch-copy
svn merge svn://<host>/project1/trunk
svn commit
If the above is correct then the following will merge all changes on the
branch into trunk ??
svn co svn://<host>/project1/trunk my-trunk-copy
cd my-trunk-copy
svn merge svn://<host>/project1/branch
svn commit
Finally is it possible for me to make a copy of the branch
ie svn copy svn://<host>/project1/branch
svn://<host>/project1/branch_2
Will branch_2 have cheap copies and become actual files (from trunk)
when modified.
Thanks
Lakshman
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merge from trunk head
Posted by Hari Kodungallur <hk...@gmail.com>.
On 1/4/06, Scott Palmer <sc...@2connected.org> wrote:
>
> On 4-Jan-06, at 2:28 AM, Hari Kodungallur wrote:
>
> >
> > svn merge actually takes two URLs at different versions. Say URL1 and
> > URL2. It takes the difference between the versions and applies it to
> > your working copy. So, you merge command should be either
> > svn merge -r N:M svn://<host>/project1/trunk
> > or
> > svn merge svn://<host>/project1/trunk@rev1 svn://<host>/project1/
> > trunk@rev2
>
>
> Are you sure that the second example does the same as the first? I
> thought the "peg revisions" were used only to lookup a path that
> might have changed in other versions. That is if URL1 and URL2 are
> the same path then there is no difference. I think the help could be
> clearer on this. I assumed that URL1 and URL2 would be tags at
> different points or something similar.
>
I do a "svn diff" with URL@rev1 and URL@rev2 all the time. And it
gives me the correct diff even if the paths are same (but the files
have changed). I am assuming merge works the same way.
rgds
--
-Hari Kodungallur
SpikeSource Inc.
http://developer.spikesource.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merge from trunk head
Posted by Scott Palmer <sc...@2connected.org>.
On 4-Jan-06, at 2:28 AM, Hari Kodungallur wrote:
>
> svn merge actually takes two URLs at different versions. Say URL1 and
> URL2. It takes the difference between the versions and applies it to
> your working copy. So, you merge command should be either
> svn merge -r N:M svn://<host>/project1/trunk
> or
> svn merge svn://<host>/project1/trunk@rev1 svn://<host>/project1/
> trunk@rev2
Are you sure that the second example does the same as the first? I
thought the "peg revisions" were used only to lookup a path that
might have changed in other versions. That is if URL1 and URL2 are
the same path then there is no difference. I think the help could be
clearer on this. I assumed that URL1 and URL2 would be tags at
different points or something similar.
This is case #1 from "svn help merge"
merge: Apply the differences between two sources to a working copy path.
usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
3. merge -r N:M SOURCE[@REV] [WCPATH]
1. In the first form, the source URLs are specified at revisions
N and M. These are the two sources to be compared. The revisions
default to HEAD if omitted.
2. In the second form, the URLs corresponding to the source working
copy paths define the sources to be compared. The revisions must
be specified.
3. In the third form, SOURCE can be a URL, or working copy item
in which case the corresponding URL is used. This URL in
revision REV is compared as it existed between revisions N and
M. If REV is not specified, HEAD is assumed.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merge from trunk head
Posted by Hari Kodungallur <hk...@gmail.com>.
On 1/3/06, Lakshman Srilakshmanan
<la...@tradingpost.com.au> wrote:
>
> Hi All,
>
> Happy New Year to you all.
>
> Could you please review the following and provide me with you valuable
> response.
>
>
> I have
> ------
> /repository/project1
> /trunk
> /branch
>
>
>
>
> To merge all the change in trunk@HEAD into branch@HEAD can I do the
> following.
>
> svn co svn://<host>/project1/branch my-branch-copy
> cd my-branch-copy
> svn merge svn://<host>/project1/trunk
> svn commit
svn merge actually takes two URLs at different versions. Say URL1 and
URL2. It takes the difference between the versions and applies it to
your working copy. So, you merge command should be either
svn merge -r N:M svn://<host>/project1/trunk
or
svn merge svn://<host>/project1/trunk@rev1 svn://<host>/project1/trunk@rev2
>
> If the above is correct then the following will merge all changes on the
> branch into trunk ??
>
> svn co svn://<host>/project1/trunk my-trunk-copy
> cd my-trunk-copy
> svn merge svn://<host>/project1/branch
> svn commit
>
See the first comment
>
> Finally is it possible for me to make a copy of the branch
> ie svn copy svn://<host>/project1/branch
> svn://<host>/project1/branch_2
>
> Will branch_2 have cheap copies and become actual files (from trunk)
> when modified.
Yes, branch_2 will be a cheap copy of branch. (I did not understand
the latter part of your question)
regards
--
-Hari Kodungallur
SpikeSource Inc.
http://developer.spikesource.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org