You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Henrik Sundberg <st...@gmail.com> on 2008/10/10 20:00:31 UTC
svn merge vs svnmerge.py
http://www.orcaware.com/svn/wiki/Svnmerge.py#FAQ says how to migrate
from svnmerge.py to svn merge.
But I cannot find any evidence of svn merge being better than svnmerge.py.
Isn't the svn merge functionality still just foundational?
Is svn merge as easy/safe to use as svnmerge.py?
Is svn merge as easy to use as svnmerge.py regarding long lived
branches (where you want to continually merge changes both from the
branch to the trunk an vice versa)?
I think the --reintegrate option will be forgotten now and then. Will
this lead to grief?
Does todays 1.5.3 release change anything significant in this area?
http://svn.collab.net/repos/svn/tags/1.5.3/CHANGES says that the merge
performance is greatly improved. Is the functionality itself better
than the functionality of svnmerge.py?
Is it time to migrate from svnmerge.py to svn merge?
/$
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn merge vs svnmerge.py
Posted by Henrik Sundberg <st...@gmail.com>.
On Sat, Oct 11, 2008 at 12:01 AM, Hyrum K. Wright
<hy...@mail.utexas.edu> wrote:
> Murli Varadachari wrote:
>> I have had similar problems with "svn merge -reintegrate" and have stopped using it [ and / or recommending it to developers ]. There is also the fact that the merge operation is v.slow.
>
> 1.5.3 (released today) has some significant merge speed improvements. Hopefully
> they will help increase the performance of Subversion on your systems.
Does this mean that svn merge has been error prone and very slow
(compared to svnmerge.py), anf from now is just error prone?
Why would http://www.orcaware.com/svn/wiki/Svnmerge.py#FAQ mention how
to migrate from svnmerge.py if the alternative was worse?
I would prefer to use just svn, without addons for functionality that
is included. But I cannot find anyone saying that svn merge is as good
as svnmerge.py.
Is there any information about when svn merge is supposed to be
better/as good as svnmerge.py?
/$
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn merge vs svnmerge.py
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Murli Varadachari wrote:
> I have had similar problems with "svn merge -reintegrate" and have stopped using it [ and / or recommending it to developers ]. There is also the fact that the merge operation is v.slow.
1.5.3 (released today) has some significant merge speed improvements. Hopefully
they will help increase the performance of Subversion on your systems.
-Hyrum
Re: svn merge vs svnmerge.py
Posted by Mark Phippard <ma...@gmail.com>.
We are seeing huge performance gains with merge in 1.5.3. But make
sure your working copy is at HEAD to get the benefits.
Sent from my iPhone
On Oct 10, 2008, at 5:35 PM, Murli Varadachari <mvaradachari@facebook.com
> wrote:
>
> I have had similar problems with “svn merge —reintegrate” and
> have stopped using it [ and / or recommending it to developers ]. T
> here is also the fact that the merge operation is v.slow.
>
> Cheers
> murli
>
>
> On 10/10/08 1:31 PM, "Carsten Koch" <Ca...@icem.com> wrote:
>
> Henrik Sundberg wrote:
> ...
> > Is svn merge as easy/safe to use as svnmerge.py?
>
> We have our own (Python) merge code which works quite well
> with subversion 1.4.6.
>
> I tested merge tracking before upgrading to subversion 1.5.2.
> All worked fine in my test cases.
>
> When I tried to use it IRL, nothing worked.
>
>
> I am getting the error message
>
> svn: Cannot reintegrate from '<URL>' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
>
> on plain vanilla "branch from trunk" / "change a file in branch"
> "commit change into branch" / "svn merge --reintegrate <branch URL>"
> operations.
>
> If I delete the "svn:mergeinfo" property from all subtrees
> (which partially defeats the purpose of course), it works slightly
> better, but I am still getting strange errors frequently, such as
> merge conflicts on the "svn:mergeinfo" property itself!
>
> IMHO, merge tracking does not work under practical conditions yet.
>
> I guess it will be useless at least for us until
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=3128
>
> gets fixed.
>
> Carsten.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>
Re: svn merge vs svnmerge.py
Posted by Murli Varadachari <mv...@facebook.com>.
I have had similar problems with "svn merge -reintegrate" and have stopped using it [ and / or recommending it to developers ]. There is also the fact that the merge operation is v.slow.
Cheers
murli
On 10/10/08 1:31 PM, "Carsten Koch" <Ca...@icem.com> wrote:
Henrik Sundberg wrote:
...
> Is svn merge as easy/safe to use as svnmerge.py?
We have our own (Python) merge code which works quite well
with subversion 1.4.6.
I tested merge tracking before upgrading to subversion 1.5.2.
All worked fine in my test cases.
When I tried to use it IRL, nothing worked.
I am getting the error message
svn: Cannot reintegrate from '<URL>' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.
on plain vanilla "branch from trunk" / "change a file in branch"
"commit change into branch" / "svn merge --reintegrate <branch URL>"
operations.
If I delete the "svn:mergeinfo" property from all subtrees
(which partially defeats the purpose of course), it works slightly
better, but I am still getting strange errors frequently, such as
merge conflicts on the "svn:mergeinfo" property itself!
IMHO, merge tracking does not work under practical conditions yet.
I guess it will be useless at least for us until
http://subversion.tigris.org/issues/show_bug.cgi?id=3128
gets fixed.
Carsten.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn merge vs svnmerge.py
Posted by Carsten Koch <Ca...@icem.com>.
Henrik Sundberg wrote:
...
> Is svn merge as easy/safe to use as svnmerge.py?
We have our own (Python) merge code which works quite well
with subversion 1.4.6.
I tested merge tracking before upgrading to subversion 1.5.2.
All worked fine in my test cases.
When I tried to use it IRL, nothing worked.
I am getting the error message
svn: Cannot reintegrate from '<URL>' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.
on plain vanilla "branch from trunk" / "change a file in branch"
"commit change into branch" / "svn merge --reintegrate <branch URL>"
operations.
If I delete the "svn:mergeinfo" property from all subtrees
(which partially defeats the purpose of course), it works slightly
better, but I am still getting strange errors frequently, such as
merge conflicts on the "svn:mergeinfo" property itself!
IMHO, merge tracking does not work under practical conditions yet.
I guess it will be useless at least for us until
http://subversion.tigris.org/issues/show_bug.cgi?id=3128
gets fixed.
Carsten.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org