Non-Tracked Merge doc

[Matt Phipps <ma...@gmail.com>]

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
APPROPRIATE? WHEN DO THEY HAPPEN SILENTLY?"

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!

-Matt

Re: Non-Tracked Merge doc

[Matt Phipps <ma...@gmail.com>]

Thanks! Also, good point about reverse merges, I forgot all about that.

-Matt

Re: Non-Tracked Merge doc

[Julian Foad <ju...@btopenworld.com>]

Matt Phipps wrote:
> 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
> APPROPRIATE? WHEN DO THEY HAPPEN SILENTLY?"
> 
> 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!

Thanks, Matt. I'm grateful that you took the trouble to write to us  to help keep things updated. I've just incorporated your suggestion in the Wiki. Please do send along any other suggestions about anything else!

And thanks for your praise. It makes working on this stuff so much more rewarding.

- Julian