[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 4306]  multiple editor drive file merges record wrong mergeinfo during conflicts
From:       pburba () tigris ! org
Date:       2013-01-25 20:19:44
Message-ID: 20130125201944.2CF7F540050 () sc157-tigr ! sjc ! collab ! net
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=4306



User pburba changed the following:

                What    |Old value                 |New value
================================================================================
                  Status|NEW                       |RESOLVED
--------------------------------------------------------------------------------
              Resolution|                          |FIXED
--------------------------------------------------------------------------------
                 Summary|multiple editor drive merg|multiple editor drive file
                        |es record wrong mergeinfo | merges record wrong merge
                        |during conflicts          |info during conflicts
--------------------------------------------------------------------------------
        Target milestone|1.8-consider              |1.8.0
--------------------------------------------------------------------------------




------- Additional comments from pburba@tigris.org Fri Jan 25 12:19:43 -0800 2013 -------
If you were wondering (like I was) why this why this bug wasn't found before
now, it's because it only affects file merges. 
libsvn_client/merge.c:do_mergeinfo_aware_dir_merge() is smart enough to adjust
the mergeinfo it records when a conflict is encountered:


              if ((next_end_rev != SVN_INVALID_REVNUM || abort_on_conflicts)
                  && is_path_conflicted_by_merge(merge_b))
                {
                  svn_merge_range_t conflicted_range;
                  conflicted_range.start = start_rev;
                  conflicted_range.end = end_rev;
                  merge_conflict_err = make_merge_conflict_error(
                                         merge_b->target->abspath,
                                         &conflicted_range,
                                         scratch_pool);
                  range.end = end_rev;
                  break;
                }

Taught libsvn_client/merge.c:do_file_merge() similar smarts in r1438683. 
Closing as fixed.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=3045946

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@subversion.tigris.org].
[prev in list] [next in list] [prev in thread] [next in thread]