You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Bicking, David (HHoldings, IT)" <Da...@thehartford.com> on 2007/10/23 20:12:22 UTC

Merge from trunk to branch, then branch to trunk

I just ran through a test in which I branched a trunk, modified the
trunk, then switched to the branch and modified the branch.  The change
was simple, and had a conflict on one file.  I merged the trunk to
branch to get its changes (simulating a real-world scenario), dealt with
the conflict, and committed.

I then switched to the trunk and merged the branch's changes into it.  I
also got a conflict here.  My question: is it normal to have to deal
with the same conflict on both ends of this operation, or am I missing
something?  I'm using 1.4.5, basic merge operation.  Is it correct that
the merge (to trunk) should occur based on the revisions leading up to
(but not including) the most recent merge to branch?

I'm going to play with this some more tomorrow.  Hopefully I will have
some insightful replies by then.  I am working from the Subversion book.
 
--
David


*************************************************************************
This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information.  If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited.  If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.
*************************************************************************

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org


Re: Merge from trunk to branch, then branch to trunk

Posted by Reid Priedhorsky <re...@umn.edu>.
Rob van Oostrum wrote:
> You should look at svnmerge and especially take note of the -b
> (bidirectional) flag. That should help you a great deal.
> 
> http://www.orcaware.com/svn/wiki/Svnmerge.py

Second the suggestion for svnmerge, but the -b flag caused a lot of 
trouble for us. AFAICT, it boiled down to: it seems -b assumes that when 
you merge, you NEVER make changes before commuting the merge. Even if 
you never make tweaks before committing the merge, you still may have 
conflicts which need to be fixed before commit.

We quit using -b and haven't had any trouble since.

Reid

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merge from trunk to branch, then branch to trunk

Posted by Rob van Oostrum <rv...@gmail.com>.
You should look at svnmerge and especially take note of the -b
(bidirectional) flag. That should help you a great deal.

http://www.orcaware.com/svn/wiki/Svnmerge.py

HTH
R.

On 10/23/07, Bicking, David (HHoldings, IT)
<Da...@thehartford.com> wrote:
> I just ran through a test in which I branched a trunk, modified the
> trunk, then switched to the branch and modified the branch.  The change
> was simple, and had a conflict on one file.  I merged the trunk to
> branch to get its changes (simulating a real-world scenario), dealt with
> the conflict, and committed.
>
> I then switched to the trunk and merged the branch's changes into it.  I
> also got a conflict here.  My question: is it normal to have to deal
> with the same conflict on both ends of this operation, or am I missing
> something?  I'm using 1.4.5, basic merge operation.  Is it correct that
> the merge (to trunk) should occur based on the revisions leading up to
> (but not including) the most recent merge to branch?
>
> I'm going to play with this some more tomorrow.  Hopefully I will have
> some insightful replies by then.  I am working from the Subversion book.
>
> --
> David
>
>
> *************************************************************************
> This communication, including attachments, is
> for the exclusive use of addressee and may contain proprietary,
> confidential and/or privileged information.  If you are not the intended
> recipient, any use, copying, disclosure, dissemination or distribution is
> strictly prohibited.  If you are not the intended recipient, please notify
> the sender immediately by return e-mail, delete this communication and
> destroy all copies.
> *************************************************************************
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org