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

Merge Conflict Resolution - local add, incoming add upon merge

From: Graeme Hodgson <graeme.hodgson_at_wandisco.com>
Date: Fri, 27 Sep 2013 17:49:35 +0100

We have a couple scenarios that seem to cause merge conflicts when merging
branch data back to the trunk. This is despite the user selecting
--accept=theirs-full in the merge operation.

The two scenarios are:
1) A file that was branched from the trunk is now deleted in the trunk and
now is being attempt to be merged back from the branch. If no changes are
made on the file in the branch you get nothing conflicted or brought in all!

That's as expected. (Julian Foad)

If there are changes (file or properties) it conflicts with status of
> "local missing, incoming edit upon merge" but you can't do any sort of
> resolve to pull in the branch version (only working state which means
> doesn't exist).
>

Unfortunately that's a limitation of tree conflict resolving at the moment:
such an option has not yet been written. (Julian Foad)

 2) A file of the same name was created on the trunk and branch AFTER the
> branch was created from trunk. In this scenario you get a conflict with
> status saying "local add, incoming add upon merge" but can't do any sort of
> resolve to pull in the branch version (only working state which means keep
> the previous file and not the branch version). You can here do a svn del of
> the file in trunk first and then run the merge but it defeats the purpose
> of adding the -accept=theirs-full in this condition.
>
> Our take is why doesn't merge with --accept=theirs-full work for both of
> these scenarios without conflict? In other words just do as the user says
> and grab the one in branch even if it means to mark as deleted the local
> one in scenario #2 because the revision lineage will now come from the
> branch?
>

We agree it should work, the support for doing it just hasn't been
implemented yet. (Julian Foad)

-- 
Regards,
Graeme Hodgson I Technical Support Engineer
WANdisco // *Non-Stop Data*
-- 
Listed on the London Stock Exchange: WAND<http://www.bloomberg.com/quote/WAND:LN>
*
*
*Register now for* Subversion & Git Live October 2013<http://www.wandisco.com/subversion-live-2013>
* **in** **Boston / San Francisco /** London*
THIS MESSAGE AND ANY ATTACHMENTS ARE CONFIDENTIAL, PROPRIETARY, AND MAY BE 
PRIVILEGED.  If this message was misdirected, WANdisco, Inc. and its 
subsidiaries, ("WANdisco") does not waive any confidentiality or privilege. 
 If you are not the intended recipient, please notify us immediately and 
destroy the message without disclosing its contents to anyone.  Any 
distribution, use or copying of this e-mail or the information it contains 
by other than an intended recipient is unauthorized.  The views and 
opinions expressed in this e-mail message are the author's own and may not 
reflect the views and opinions of WANdisco, unless the author is authorized 
by WANdisco to express such views or opinions on its behalf.  All email 
sent to or from this address is subject to electronic storage and review by 
WANdisco.  Although WANdisco operates anti-virus programs, it does not 
accept responsibility for any damage whatsoever caused by viruses being 
passed.
Received on 2013-09-27 23:27:36 CEST

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