On Aug 27, 2013, at 1:39 PM, Mark Phippard wrote:
> On Tue, Aug 27, 2013 at 4:34 PM, Jacob Weber wrote:
> The next time I merge from trunk into my branch, how will SVN know not to
> merge X?
>
> Magic :)
>
> Internally, the code still does reintegrate. It just figures out when it
> needs t
On Tue, Aug 27, 2013 at 4:34 PM, Jacob Weber wrote:
> According to the SVN 1.8 release notes: "Merging to-and-fro between two
> branches in any order is possible using the automatic reintegration merge
> (the "keep-alive dance" is no longer necessary)."
>
> So say I merge from a branch into trunk
According to the SVN 1.8 release notes: "Merging to-and-fro between two
branches in any order is possible using the automatic reintegration merge (the
"keep-alive dance" is no longer necessary)."
So say I merge from a branch into trunk (i.e. what used to be a reintegrate),
creating revision X.
