Fossil

Check-in [370a89c8]
Login

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

Overview
Comment:Fix a typo in an error message in the merge logic.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 370a89c8328b4a67b77af33ae3393d33462797c4
User & Date: drh 2010-11-08 15:33:49
Context
2010-11-08
19:02
When the "update" command has a FILES argument which is the top-level directory, that is the same as having no FILES argument at all. In other words, all files are updated. check-in: 2d1a0373 user: drh tags: trunk
19:00
Begin adding "import" and "export" commands for converting repositories from and to the Git format. The "export" command currently generates output but is not quite correct. The "import" command is still a stub. check-in: b3fd32f9 user: drh tags: experimental
15:33
Fix a typo in an error message in the merge logic. check-in: 370a89c8 user: drh tags: trunk
15:13
Allow merges against an empty branch. Ticket [144180bf7db83724a9]. check-in: 4e3cd6ce user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/merge.c.

94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
    db_prepare(&q, "SELECT merge FROM vmerge WHERE id=0");
    while( db_step(&q)==SQLITE_ROW ){
      pivot_set_secondary(db_column_int(&q,0));
    }
    db_finalize(&q);
    pid = pivot_find();
    if( pid<=0 ){
      fossil_fatal("cannot find a common ancestor between the current"
                   "checkout and %s", g.argv[2]);
    }
  }
  if( !is_a_version(pid) ){
    fossil_fatal("not a version: record #%d", pid);
  }
  vfile_check_signature(vid, 1);







|







94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
    db_prepare(&q, "SELECT merge FROM vmerge WHERE id=0");
    while( db_step(&q)==SQLITE_ROW ){
      pivot_set_secondary(db_column_int(&q,0));
    }
    db_finalize(&q);
    pid = pivot_find();
    if( pid<=0 ){
      fossil_fatal("cannot find a common ancestor between the current "
                   "checkout and %s", g.argv[2]);
    }
  }
  if( !is_a_version(pid) ){
    fossil_fatal("not a version: record #%d", pid);
  }
  vfile_check_signature(vid, 1);