Fossil

Check-in [1343cfad]
Login

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

Overview
Comment:If at the tip of the current branch but there are children in other branches, the "fossil up" command should do nothing.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1343cfad7bd4a27f76322ac7f466e43af2898f8d
User & Date: drh 2011-05-21 16:57:26
Context
2011-05-23
15:06
Merge the solaris10 branch into the trunk. check-in: 3e0efc38 user: drh tags: trunk
2011-05-22
14:23
Create new branch named "ben-security" check-in: 2b4a6a66 user: ben tags: ben-security
09:11
Create new branch named "versionable-settings" check-in: 3db75c48 user: ben tags: versionable-settings
07:33
Create new branch named "solaris10" check-in: eb4b5e3b user: ben tags: solaris10
2011-05-21
16:57
If at the tip of the current branch but there are children in other branches, the "fossil up" command should do nothing. check-in: 1343cfad user: drh tags: trunk
16:45
Print an "Internal Error" if the update command is unable to find a version to update to. check-in: 88e9f24a user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/update.c.

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 */