hrmmm... interesting. I was getting "no common ancestor".
I closed that repo to mail it. You did you testing (successfully). I re-opened the repo to replicate my results, and in fact it worked fine. If you (anybody) have the time, would you create a repo and go through the ~10 steps manually and see what happens? What I was concentrating on is: [vendor] is branched off initial emtpy ci [feature] is branched off [trunk] [feature] <-[vendor] before [trunk] <- [vendor] [feature] <- [trunk] then fails w/ "no common ancestors" Now, out of curiosity I'm going to close/open my test/clone "problem" repo. On 10/10/13, Stephan Beal <sgb...@googlemail.com> wrote: > On Thu, Oct 10, 2013 at 7:31 PM, B Harder <brad.har...@gmail.com> wrote: > >> Breakthrough! >> >> I have a minimal(ish) example of a repo that is broken: >> >> Take the attached (broken.fsl, 62K) repo, co [vendor], and try to merge >> [trunk]. >> > > i end up with: > > http://www.wanderinghorse.net/tmp/brad-broke.png > > which is what i would expect? (Of course i had to lie and say i was user > bch.) > > > This is fossil version 1.27 [4137f4cda9] 2013-09-26 08:09:03 UTC > > -- > ----- stephan beal > http://wanderinghorse.net/home/stephan/ > http://gplus.to/sgbeal > -- 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
