Overview
| SHA1 Hash: | 5c3e87171a336b076e87377b786fa9a1de711016 |
|---|---|
| Date: | 2007-08-01 12:17:14 |
| User: | drh |
| Comment: | Fix a problem in the commit logic that caused it to ignore merge changes. Add another test to the commit to detect future problems of a similar nature. |
| Timelines: | ancestors | descendants | both | trunk |
| Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[show diffs]Modified src/checkin.c from [f97001dc6f] to [5e2184d9ad]. [diff]
Modified src/vfile.c from [e0efe29333] to [d4b9c4a1e5]. [diff]