[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

AW: Bug in svn merge when files are commited with changes into the branch

From: thomas mauch <Thomas.Mauch_at_swisslog.com>
Date: 2005-07-04 17:18:21 CEST

Thanks for your explanation. Looking back, it's hard to understand why I
did not see the solution after I have found out that it occurs only if
the file checked into the branch already had uncommited changes.

> Most examples show starting with the branch creating rev because the
> common case is to just create a branch with no modified files in the
> commit. I do the same thing to bump version numbers when I branch,
and
> I have to remember to start with branch_creation-1 when merging back
to
> trunk.

As you write, this happens to you as well from time to time. When I
think about it, it seems to me that it should be safe to always use
branch-creation-1 when merging back to trunk. It this true? If this is
the case, I think it would be a good idea to use branch-creation-1 as
well (may be with a short explanation) in the example "Merging a Whole
Branch to Another" in the Subversion book.

Thomas

____________________________________________________________
This message may contain legally privileged or confidential
information and is therefore addressed to the named persons only.
The recipient should inform the sender and delete this message,
if he/she is not named as addressee.
The sender disclaims any and all liability for the integrity
and punctuality of this message.
The sender has activated an automatic virus scanning by
Messagelabs, but does not guarantee the virus free
transmission of this message.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 4 17:32:58 2005

This is an archived mail posted to the Subversion Users mailing list.