I know what you're talking about, but I'm not seeing the results I hope for.
I've made a copy of the repo, and have teased out ea. commit/event SHA1. I've run on ea. SHA1 "fossil tag list --raw [sha1_id]" and collected that output[0]. The tags look like I'd expect (though I could be mistaken) and the web rendering fits my same mental model... however, when I: "fossil co os_x" and try to "fossil merge trunk", it still fails... Interestingly, I can checkout a certain os_x commit, and merge from anywhere in trunk. The next os_x commit, though, fails. I didn't think os_x tags were at issue, and they *look* sane to me... am I misinterpretting behaviour? [0] Example commit/tag info ========== [3c239fe86a] ========== branch=os_x sym-os_x ========== ========== [8aa3d3239e] ========== tkt-537e90fb9d44b8091abd9d04667a66d241e7d13f ========== ========== [5c5f613aa8] ========== branch=trunk sym-trunk ========== ========== [60d23a19c0] ========== branch=vendor sym-vendor ========== ========== [ae48737be6] ========== branch=os_x sym-os_x ========== On 10/9/13, Mark Janssen <mpc.jans...@gmail.com> wrote: > Branches are controlled by propagating raw tags. Start with fossil tag list > --raw checkin. Then I think you should be able to cancel the offending raw > tag. > On 9 Oct 2013 23:07, "B Harder" <brad.har...@gmail.com> wrote: > >> ...and now I see the edit where the trunk tag was cancelled -- >> question remains --- can I undo/reverse the effect? >> >> On 10/9/13, B Harder <brad.har...@gmail.com> wrote: >> > It appears that somehow the branch tag was deleted on my [trunk]. >> > >> > Now, when I try to merge from trunk -> feature_branch, I get something >> > like: >> > >> > >> > $ fossil merge trunk >> > WARNING - no common ancestor: filea.c >> > WARNING - no common ancestor: fileb.c >> > WARNING - no common ancestor: filec.c >> > ... >> > ADDED src/otherfile_a.c >> > ADDED src/otherfile_b.c >> > ADDED src/otherfile_c.c >> > >> > How can I restore the "trunkness" of trunk through its complete >> > timeline? I tried adding "trunk" tags, but I didn't suspect they'd >> > work, and I was correct. >> > >> > -- >> > Brad Harder >> > Method Logic Digital Consulting >> > http://www.methodlogic.net/ >> > http://twitter.com/bcharder >> > >> >> >> -- >> Brad Harder >> Method Logic Digital Consulting >> http://www.methodlogic.net/ >> http://twitter.com/bcharder >> _______________________________________________ >> fossil-users mailing list >> fossil-users@lists.fossil-scm.org >> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >> > -- Brad Harder Method Logic Digital Consulting http://www.methodlogic.net/ http://twitter.com/bcharder _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
