subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache subversion Wiki <comm...@subversion.apache.org>
Subject [Subversion Wiki] Update of "SymmetricMerge" by JulianFoad
Date Thu, 08 Mar 2012 15:16:52 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.

The "SymmetricMerge" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SymmetricMerge?action=diff&rev1=56&rev2=57

  === Cherry-Pick 3 and Reintegrate (Merge in Opposite Direction) ===
  Like "Cherry-Pick 2 and Sync Again", Subversion currently does not notice the cherry-pick
in this case.
  
+ What ''should'' happen, however, is more complex.  The cherry-pick logical change (B3) is
not one of the changes we were planning to merge.  The first change we're planning to merge
is A1:B4, which represents three logical changes (B2, B3, B4).  We're not going to attempt
to take part of that first physical change (A1:B4), so our options are to complain to the
user, or to go ahead and accept that part of what we're merging is already on the target.
- What ''should'' happen, however, is more complex.  The cherry-pick source is not one of
the changes we were planning to merge, because we were planning to take the change A#:B# instead
of A:1-#.
- 
- [TODO: fill in the text and rev numbers]
- 
- [TODO: the graph]
  
  {{attachment:merge-cherry3-reint-1.png|Cherry-Pick 3 and Reintegrate}}
  

Mime
View raw message