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

Non-Tracked Merge doc

From: Matt Phipps <matt.the.mech_at_gmail.com>
Date: Thu, 26 Jun 2014 13:27:49 -0400

Hi dev list,

I saw a section in
https://wiki.apache.org/subversion/SupportedMergeScenarios saying
about non-tracked merges: "### WHICH MERGES ARE THESE? WHEN ARE THEY

A merge like that would make sense if you wanted to do a Git-style
rebase for whatever reason. You would create a new project branch off
your development branch, cherry-pick all the non-merge changes from
the old project branch onto it (possibly grouping or reordering or
deleting commits), then delete the old branch. The new branch
shouldn't have mergeinfo from the old branch since the old branch is
getting deleted and replaced.

Not sure if you guys want to keep that doc updated; just thought I
would point it out. Also, thanks for Subversion, especially the
automatic reintegration stuff. It's really cool!

Received on 2014-06-26 19:32:45 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.