| Ticket UUID: | 5751755d47d959f5b1d55761abd4308d8b8ea9bb | ||
| Title: | Initial check-in isn't usable | ||
| Status: | Closed | Type: | Code_Defect |
| Severity: | Important | Priority: | |
| Subsystem: | Resolution: | Fixed | |
| Last Modified: | 2010-08-18 17:48:50 | ||
| Version Found In: | 3343450e64 | ||
| Description & Comments: | |||
|
I want to handle vendor branches in a reasonable manner.
I'm trying to do the following: commit vendor version
into branch and merge the result onto trunk.
Initial steps: $ mkdir /tmp/bug; cd /tmp/bug $ fossil new bug project-id: a4f5ac4cd49798bac13036300ab62f021b7f5388 server-id: d9e3d87cd655de7631396980dc753002ede0316c admin-user: asau (initial password is "ea9c71") $ mkdir test; cd test; fossil open ../bug $ fossil timeline === 2010-06-23 === 06:42:52 [cef303f2f8] *CURRENT* initial empty check-in (user: asau tags: trunk) Let's try to import vendor version and merge it onto trunk: $ :> test $ fossil add test ADDED test $ fossil ci --branch vendor-version -m "Import vendor version." New_Version: 3ae4f0043b0d330d828d3712961ae9027f33ea61 $ fossil close $ rm -f * $ fossil open ../bug trunk fossil: object [cef303f2f8] is not a check-in ??? $ fossil merge vendor-version fossil: lack both primary and secondary files ??? It doesn't work, somehow "initial check-in" is too special to be a "check-in". Work around is to create another empty check-in:
$ fossil ci -f -m "Commit empty changes to work around."
New_Version: 43da68d6ed8fd95d9728801a2ede65f0090d5e61
$ fossil timeline
=== 2010-06-23 ===
06:45:09 [43da68d6ed] *CURRENT* Commit empty changes to work around. (user:
asau tags: trunk)
06:43:56 [3ae4f0043b] Import vendor version. (user: asau tags: vendor-version)
06:42:52 [cef303f2f8] *BRANCH* initial empty check-in (user: asau tags: trunk)
$ fossil merge vendor-version
ADDED test
$ fossil ci -m "Merge vendor version."
New_Version: 5ea37a73c292159210ba89de2315ea202f9afb9d
$ fossil close
It would be nice not to require this workaround. bch added on 2010-08-18 17:48:50: | |||