Fossil

Check-in [bf919337]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Tweaks to the merge conflict notation.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:bf919337bb4c2f2d08391cb42fdf8f64ba773937
User & Date: drh 2010-12-16 15:03:25
Context
2010-12-17
12:03
Remember which database was opened first (as the "main" database) in the g.zMainDbType global variable. check-in: 99f52f38 user: drh tags: trunk
2010-12-16
15:03
Tweaks to the merge conflict notation. check-in: bf919337 user: drh tags: trunk
14:46
Use relative URLs for hyperlinks whereever possible, so that Fossil can work better behind a reverse proxy. check-in: daeb10f6 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/merge3.c.

152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
  int i1, i2;            /* Index into aC1[] and aC2[] */
  int nCpy, nDel, nIns;  /* Number of lines to copy, delete, or insert */
  int limit1, limit2;    /* Sizes of aC1[] and aC2[] */
  int nConflict = 0;     /* Number of merge conflicts seen so far */
  static const char zBegin[] =
    "<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<<\n";
  static const char zMid[]   =
    "======= original content above; merged content below =======\n";
  static const char zEnd[]   =
    ">>>>>>> END MERGE CONFLICT: merged content last >>>>>>>>>>>>\n";

  blob_zero(pOut);         /* Merge results stored in pOut */

  /* Compute the edits that occur from pPivot => pV1 (into aC1)
  ** and pPivot => pV2 (into aC2).  Each of the aC1 and aC2 arrays is
  ** an array of integer triples.  Within each triple, the first integer
  ** is the number of lines of text to copy directly from the pivot,







|

|







152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
  int i1, i2;            /* Index into aC1[] and aC2[] */
  int nCpy, nDel, nIns;  /* Number of lines to copy, delete, or insert */
  int limit1, limit2;    /* Sizes of aC1[] and aC2[] */
  int nConflict = 0;     /* Number of merge conflicts seen so far */
  static const char zBegin[] =
    "<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<<\n";
  static const char zMid[]   =
    "======= original content above; conflict below =============\n";
  static const char zEnd[]   =
    ">>>>>>> END MERGE CONFLICT: conflict last >>>>>>>>>>>>>>>>>>\n";

  blob_zero(pOut);         /* Merge results stored in pOut */

  /* Compute the edits that occur from pPivot => pV1 (into aC1)
  ** and pPivot => pV2 (into aC2).  Each of the aC1 and aC2 arrays is
  ** an array of integer triples.  Within each triple, the first integer
  ** is the number of lines of text to copy directly from the pivot,