On 3/11/15, Andreas Kupries <andre...@activestate.com> wrote:
> On Wed, Mar 11, 2015 at 8:25 AM, Richard Hipp <d...@sqlite.org> wrote:
>> On 3/11/15, David Mason <dma...@ryerson.ca> wrote:
>>> I have several students who, through some problem while cloning the
>>> fossil I created for them, created a parallel timeline. (see
>>> screenshot)
>>
>>> I want to merge them, but fossil merge says there's no head to merge.
>>> The commits by the student are on the right and are not tagged as
>>> trunk, but tagging them as such doesn't seem to help. Using
>>> --baseline in merge didn't help either.
>>
>> I was about to suggest using --baseline. What is the exact
>> command-sequence that you used? And how do you know it didn't work -
>> did it give an error?
>
> I wonder if merging by exact sha-hash would work ?
>
I'm looking at the source code, and I'm thinking that --baseline ought
to work. The command sequence should be:
fossil update 33f9c5915f
fossil merge 094b1b8a4d --baseline ce53290262
I'm still curious as to how the students managed to get the repo into
this state, too. The only thing I can think of is that they had one
or more check-ins in between ce53290262 and 198f28add5 that the
shunned. It makes me wonder if we ought not put more safety checks
and harsher warnings on the "shun" command?
--
D. Richard Hipp
d...@sqlite.org
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
