[Show "Revision History"] [Show "General Page Infos"] [Show "Page hits and edits"]

Revision History

Showing page edit history entries from 212 to 311 out of 311 entries total. (5 | 10 | 25 | 50 | 100 | 200 items per page)

311 211 111 11 Older
# Date Size Editor Comment Action
97 2013-04-11 20:50:48 52320 to previous pburba Update symmetric merge algorithm to reflect changes made in r1464102 view
96 2013-03-27 21:38:42 51805 to previous JulianFoad Fix an in-page cross-reference view
95 2012-08-20 14:21:41 51793 to previous JulianFoad   view
94 2012-08-20 14:14:21 51794 to previous JulianFoad Add a reference (criss-cross in Bazaar) view
93 2012-08-03 16:35:32 51524 to previous JulianFoad Add a 'User perspective' section view
92 2012-06-13 09:38:09 48612 to previous JulianFoad Define more terms in the Terminology section. view
91 2012-04-30 14:12:51 46603 to previous JulianFoad Correct the merge stated for Criss-cross #4. Found by: stefan2/cristian. view
90 2012-04-20 10:37:26 46471 to previous JulianFoad More on Mixed-Rev, Switched, Sparse view
89 2012-04-20 10:15:59 45197 to previous JulianFoad Add a section on Mixed-Rev, Switched, or Sparse WC view
88 2012-04-18 14:06:58 43914 to previous JulianFoad Start a 'References' appendix. view
87 2012-04-18 11:33:48 43525 to previous JulianFoad More criss-cross. view
- 2012-04-18 07:36:28 280 - JulianFoad ATTNEW: merge-criss-cross-4.txt view get
86 2012-04-17 17:12:30 41816 to previous JulianFoad   view
- 2012-04-17 17:11:33 17107 - JulianFoad ATTNEW: merge-criss-cross-4.png view get
85 2012-04-17 11:32:33 41618 to previous JulianFoad   view
84 2012-04-16 16:53:20 40760 to previous JulianFoad Fill in Symmetric Merge Algorithm view
83 2012-04-11 11:02:53 36036 to previous JulianFoad   view
82 2012-04-11 08:21:43 35187 to previous JulianFoad Tweak formatting of subtree merge example view
81 2012-04-10 13:42:07 35165 to previous JulianFoad   view
80 2012-04-10 13:19:59 34302 to previous JulianFoad Add terminology entry "natural history". view
79 2012-04-10 13:17:01 34098 to previous JulianFoad Fix an error in "natural history" in criss-cross merge case #3, found by stefan2. view
78 2012-04-09 01:56:54 34095 to previous DanielShahaf subtree mergeinfo += exaple view
77 2012-04-05 14:27:11 33383 to previous JulianFoad   view
76 2012-04-04 17:17:56 32921 to previous JulianFoad Start writing up subtree merges. view
75 2012-03-16 10:24:40 30861 to previous JulianFoad Say 'V1.7' instead of 'currently' or 'today'. view
74 2012-03-16 10:17:32 30885 to previous JulianFoad "The Origin of a Branch": add graphs, tweak wording. view
- 2012-03-16 10:11:12 180 - JulianFoad ATTNEW: merge-origin-o.txt view get
- 2012-03-16 10:11:07 5923 - JulianFoad ATTNEW: merge-origin-o.png view get
- 2012-03-16 10:11:01 160 - JulianFoad ATTNEW: merge-origin-b.txt view get
- 2012-03-16 10:10:52 4114 - JulianFoad ATTNEW: merge-origin-b.png view get
- 2012-03-16 10:10:46 160 - JulianFoad ATTNEW: merge-origin-a.txt view get
- 2012-03-16 10:10:37 4153 - JulianFoad ATTNEW: merge-origin-a.png view get
- 2012-03-16 10:03:06 0 - JulianFoad ATTDEL: merge-two-sides-3.txt
- 2012-03-16 10:03:02 0 - JulianFoad ATTDEL: merge-two-sides-3.png
73 2012-03-16 10:02:53 30919 to previous JulianFoad Expand "The Two Sides of a Merge" view
- 2012-03-16 10:00:11 236 - JulianFoad ATTNEW: merge-two-sides-1b.txt view get
- 2012-03-16 10:00:03 209 - JulianFoad ATTNEW: merge-two-sides-1.txt view get
- 2012-03-16 09:59:49 11020 - JulianFoad ATTNEW: merge-two-sides-1b.png view get
- 2012-03-16 09:59:37 10902 - JulianFoad ATTNEW: merge-two-sides-1.png view get
- 2012-03-16 09:51:24 236 - JulianFoad ATTNEW: merge-two-sides-1b.txt view get
- 2012-03-16 09:51:16 11020 - JulianFoad ATTNEW: merge-two-sides-1b.png view get
- 2012-03-16 09:33:01 232 - JulianFoad ATTNEW: merge-two-sides-2.txt view get
- 2012-03-16 09:32:50 13270 - JulianFoad ATTNEW: merge-two-sides-2.png view get
- 2012-03-16 09:32:41 209 - JulianFoad ATTNEW: merge-two-sides-1.txt view get
- 2012-03-16 09:32:34 10902 - JulianFoad ATTNEW: merge-two-sides-1.png view get
- 2012-03-16 09:22:23 0 - JulianFoad ATTNEW: merge-two-sides-3.txt
- 2012-03-16 09:22:17 0 - JulianFoad ATTNEW: merge-two-sides-3.png
- 2012-03-16 09:22:10 209 - JulianFoad ATTNEW: merge-two-sides-1.txt view get
- 2012-03-16 09:22:02 10902 - JulianFoad ATTNEW: merge-two-sides-1.png view get
72 2012-03-16 08:55:58 29775 to previous JulianFoad Typo view
71 2012-03-15 17:18:19 29788 to previous DanielShahaf The Two Sides of a Merge += slightly more concrete example view
70 2012-03-15 17:14:24 29548 to previous DanielShahaf criss-cross += subheaders view
69 2012-03-15 17:10:16 29319 to previous DanielShahaf display the attachment inline view
68 2012-03-15 17:09:28 29319 to previous DanielShahaf cherry: another degenerate case view
67 2012-03-15 17:02:33 29169 to previous DanielShahaf algorithm += merging of revisions that merge both already-merged and not-already-merged logical changes view
66 2012-03-15 16:47:11 29098 to previous JulianFoad   view
65 2012-03-15 16:36:27 28407 to previous JulianFoad   view
64 2012-03-15 16:30:18 28330 to previous JulianFoad More criss-cross. view
- 2012-03-15 16:16:52 268 - JulianFoad ATTNEW: merge-criss-cross-3.txt view get
- 2012-03-15 16:16:45 16276 - JulianFoad ATTNEW: merge-criss-cross-3.png view get
63 2012-03-15 15:59:36 27622 to previous JulianFoad Add a second criss-cross merge graph. view
- 2012-03-15 15:55:20 262 - JulianFoad ATTNEW: merge-criss-cross-2.txt view get
- 2012-03-15 15:55:12 16958 - JulianFoad ATTNEW: merge-criss-cross-2.png view get
62 2012-03-15 15:33:34 27715 to previous JulianFoad Criss-cross merge: corrections to danielsh's edits, and further expansion. view
61 2012-03-15 13:52:01 26467 to previous JulianFoad Address some of danielsh's comments view
60 2012-03-15 13:08:05 26292 to previous DanielShahaf Criss-cross: typo fixes and an extension view
59 2012-03-15 12:42:23 25887 to previous DanielShahaf Elaborate a bit on "forward" and "backward", per IRC. view
58 2012-03-15 12:38:14 25556 to previous DanielShahaf add some comments on the algorithm view
57 2012-03-08 15:16:50 24977 to previous JulianFoad   view
- 2012-03-08 14:14:13 289 - JulianFoad ATTNEW: merge-cherry3-reint1.txt view get
- 2012-03-08 14:14:07 20852 - JulianFoad ATTNEW: merge-cherry3-reint1.png view get
- 2012-03-08 14:13:58 293 - JulianFoad ATTNEW: merge-cherry2-sync-4.txt view get
- 2012-03-08 14:13:52 19214 - JulianFoad ATTNEW: merge-cherry2-sync-4.png view get
- 2012-03-08 14:13:46 293 - JulianFoad ATTNEW: merge-cherry2-sync-3.txt view get
- 2012-03-08 14:13:41 22410 - JulianFoad ATTNEW: merge-cherry2-sync-3.png view get
- 2012-03-08 14:13:33 322 - JulianFoad ATTNEW: merge-cherry2-sync-2.txt view get
- 2012-03-08 14:13:26 25670 - JulianFoad ATTNEW: merge-cherry2-sync-2.png view get
- 2012-03-08 14:13:21 291 - JulianFoad ATTNEW: merge-cherry2-sync-1.txt view get
- 2012-03-08 14:13:11 18292 - JulianFoad ATTNEW: merge-cherry2-sync-1.png view get
- 2012-03-08 14:12:53 285 - JulianFoad ATTNEW: merge-cherry1-sync-1.txt view get
- 2012-03-08 14:12:47 16125 - JulianFoad ATTNEW: merge-cherry1-sync-1.png view get
- 2012-03-08 14:12:33 287 - JulianFoad ATTNEW: merge-cherry1-reint-1.txt view get
- 2012-03-08 14:12:27 16921 - JulianFoad ATTNEW: merge-cherry1-reint-1.png view get
56 2012-03-08 14:04:15 24784 to previous JulianFoad   view
- 2012-03-08 13:58:52 289 - JulianFoad ATTNEW: merge-cherry3-reint-1.txt view get
- 2012-03-08 13:58:52 289 - JulianFoad ATTDEL: merge-cherry3-reint1.txt view get
- 2012-03-08 13:58:39 20852 - JulianFoad ATTNEW: merge-cherry3-reint-1.png view get
- 2012-03-08 13:58:39 20852 - JulianFoad ATTDEL: merge-cherry3-reint1.png view get
- 2012-03-08 13:57:45 289 - JulianFoad ATTNEW: merge-cherry3-reint1.txt view get
- 2012-03-08 13:57:38 20852 - JulianFoad ATTNEW: merge-cherry3-reint1.png view get
- 2012-03-08 11:52:13 16125 - JulianFoad ATTNEW: merge-cherry1-sync-1.png view get
- 2012-03-08 11:51:08 285 - JulianFoad ATTNEW: merge-cherry1-sync-1.txt view get
- 2012-03-08 11:51:02 16125 - JulianFoad ATTNEW: merge-cherry1-sync-1.png view get
- 2012-03-08 11:49:07 0 - JulianFoad ATTDEL: merge-cherry-fwd-sync-3.txt
- 2012-03-08 11:49:04 0 - JulianFoad ATTDEL: merge-cherry-fwd-sync-3.png
- 2012-03-08 11:49:03 0 - JulianFoad ATTDEL: merge-cherry-fwd-sync-2.txt
- 2012-03-08 11:49:01 0 - JulianFoad ATTDEL: merge-cherry-fwd-sync-2.png
- 2012-03-08 11:48:59 0 - JulianFoad ATTDEL: merge-cherry-fwd-sync-1.txt
- 2012-03-08 11:48:56 0 - JulianFoad ATTDEL: merge-cherry-fwd-sync-1.png
- 2012-03-08 11:48:55 0 - JulianFoad ATTDEL: merge-cherry-back-sync-4.txt
311 211 111 11 Older