Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory
New page:
#REDIRECT SymmetricMerge
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=45&rev2=46
== Cherry-pick Merges ==
A ''cherry-pick''
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=44&rev2=45
This is all very well, and merges the rig
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=43&rev2=44
Comment:
Add an Abstract and start a Terminolo
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=41&rev2=42
- What's the difference between 'sync' and 're
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=40&rev2=41
{{attachment:merge-cherry-back-sync-1.png
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=39&rev2=40
Comment:
More on cherry-picking
To perform
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=38&rev2=39
<>
== Background on 3-way merging ==
-
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=35&rev2=36
Comment:
Add "Origin of a Branch" section
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=33&rev2=34
{{attachment:merge-reint-dance-sync-3.png
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=32&rev2=33
More significantly, neither does the mergein
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=31&rev2=32
{{attachment:merge-sync-1-svn.png|svn syn
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=30&rev2=31
- What's the theoretical difference between 's
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=29&rev2=30
End of longest continuous prefix of sourc
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=28&rev2=29
More significantly, neither does the merg
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=27&rev2=28
Those are the basic cases that Subversion
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=26&rev2=27
The conclusion is: to merge correctly, th
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=25&rev2=26
What we need is a single algorithm that f
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=24&rev2=25
- What's the theoretical difference between 's
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=23&rev2=24
Same dir'n -- svn succeeds. Opposite dir
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=22&rev2=23
Those are the basic cases that Subversion
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=20&rev2=21
{{attachment:merge-reint-reint-1.png|svn
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=19&rev2=20
{{attachment:merge-reint-sync-1.png|svn r
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=18&rev2=19
TODO: How a record-only merge ("keep-alive d
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=17&rev2=18
* For the 3-way merge, Subversion selects a
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=15&rev2=16
* For the 3-way merge, Subversion selects a
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=14&rev2=15
* For the 3-way merge, Subversion selects a
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=13&rev2=14
* Determine the changes from A that have no
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=12&rev2=13
{{attachment:merge-reint-1.png|svn reinte
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=10&rev2=11
== 3-way merge ==
Subversion currently per
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=9&rev2=10
What if, instead of a second sync merge, a
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=8&rev2=9
But what's the mergeinfo? [TODO...]
== 3-
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=4&rev2=5
The only significant difference is that Subver
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=2&rev2=3
{{attachment:merge-sync-1-svn.png|svn sync mer
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=1&rev2=2
What's the theoretical difference between 'syn
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory
New page:
What's the theoretical difference between 'sync', 'reintegrate'
36 matches
Mail list logo
