On Jan 30, 2008 10:01 PM, Ravi Roy <ravi.aroy_at_gmail.com> wrote:
> Hi All,
>
> I have one local checkedout copy of trunk and other checked-out copy
> of branch they have different revisions. I know the revision when
> trunk copy was converted to branch. My question is when I use the the
> following command :
>
> svn merge <WC of branch>@550 <latest WC of trunk>@750 <another latest
> WC of trunk>
>
> I want to diff and merge from branch to trunk working copy.
Note that this command will take the difference from branch_at_550 to
trunk_at_750and merge them again to trunk. In effect, it will merge
changes made in
trunk between 550 and 750 and merge it back to trunk. In addition the diff
will turn up additions in the branch upto 550 as deletions. Since, this does
not make much sense, I think you may have go the command wrong. What exactly
do you want to do?
In case you want to merge all the changes that have been made in the branch
to the trunk, then use:
svn merge -r N:M <branchURL> <latest WC of trunk>
where N = the rev when branch was branched from trunk
and M = latest revision in the branch
>
>
> 1. Will the command diff and merge to the <another lastest WC of
> trunk> and not immediately commit to repository ?
Correct. The merge command never commits to the repository. It always
modifies the working copy only. The merges must be committed separately to
the repository using svn ci command.
>
>
> 2.Is repository is immediately affected in case of problems ?
>
> I think, I am working on WC, so repository would not be affected ?
As explained above, only the working copy is affected by the merge command.
The repository is changed only after you do an explicit commit (svn ci).
Regards,
-Hari
Received on 2008-01-31 07:38:53 CET