Fossil

Differences From Artifact [bc17008a66]:

• File src/update.c — part of check-in [88e9f24aff] at 2011-05-21 16:45:50 on branch trunk — Print an "Internal Error" if the update command is unable to find a version to update to. (user: drh size: 20299)

To Artifact [b07510de51]:

• File src/update.c — part of check-in [1343cfad7b] at 2011-05-21 16:57:26 on branch trunk — If at the tip of the current branch but there are children in other branches, the "fossil up" command should do nothing. (user: drh size: 20327) [more...]

173
174
175
176
177
178
179

180
181
182
183
184
185
186

        db_finalize(&q);
        fossil_fatal("Multiple descendants");
      }
    }
    tid = db_int(0, "SELECT rid FROM leaves, event"
                    " WHERE event.objid=leaves.rid"
                    " ORDER BY event.mtime DESC"); 

  }

  if( tid==0 ){
    fossil_panic("Internal Error: unable to find a version to update to.");
  }

  if( tid==vid && !verboseFlag ) return;  /* Nothing to update */

>

173
174
175
176
177
178
179
180
181
182
183
184
185
186
187

        db_finalize(&q);
        fossil_fatal("Multiple descendants");
      }
    }
    tid = db_int(0, "SELECT rid FROM leaves, event"
                    " WHERE event.objid=leaves.rid"
                    " ORDER BY event.mtime DESC"); 
    if( tid==0 ) tid = vid;
  }

  if( tid==0 ){
    fossil_panic("Internal Error: unable to find a version to update to.");
  }

  if( tid==vid && !verboseFlag ) return;  /* Nothing to update */