Differences between revisions 11 and 12
Revision 11 as of 2012-04-25 10:30:32
Size: 1476
Editor: JulianFoad
Comment:
Revision 12 as of 2012-11-08 18:32:59
Size: 1591
Editor: JulianFoad
Comment:
Deletions are marked like this. Additions are marked like this.
Line 11: Line 11:
=== My Pages ===
==== Merge-related Design Notes ====
== My Pages ==
=== Design Notes ===
TreeApi — an API for traversing and accessing any tree of files/dirs/properties in Subversion

=== Merge-related Design Notes ===
Line 37: Line 40:
=== Other People's Pages === == Other People's Pages ==

Julian Foad

A developer of Apache Subversion

A Senior Subversion Committer at WANdisco, Inc. the maker of uberSVN

A member of the Apache Software Foundation

My Pages

Design Notes

TreeApi — an API for traversing and accessing any tree of files/dirs/properties in Subversion

My unofficial design notes, plans and ideas for making branching and merging easier — or at least harder to get wrong.

SymmetricMerge — unifying 'sync' and 'reintegrate'

KeepingReintegratedBranchAlive — how to make it easier

SimpleAndSafeMerges — ideas on what guidance/enforcements we could provide for users to merge within their preferred (and our supported) policies.

SupportedMergeScenarios — documenting what kinds of merging patterns Subversion currently supports.

MergeTrackingIdeas — the main idea being to support flexible branching topologies by tracking logical changes.

BranchingMergingTerminology

MergeBugsAndErrorReporting — simple bugs, and enhancements to error reporting.

MergeCodeImprovements — source code improvement tasks.

BranchesAndBranchRoots — about teaching Subversion what "a branch" is.

CallGraphOfMergeCode

UserInterfaceChanges

Other People's Pages

Rick Yorgason's MtimePreservation

Stefan Fuhrmann's MergeLimits -- how merging could be better in high-level ways

JulianFoad (last edited 2012-11-08 18:32:59 by JulianFoad)