+1 I faced this a couple of days back and had to perform an incorrect commit.
> ----- Original Message ----- > From: Leo Razoumov > Sent: 02/10/12 03:39 AM > To: Fossil SCM user's discussion > Subject: [fossil-users] "fossil commit" failure after merge > > Hi List, > I ran into a strange problem which results in "fossil commit" failure > after a specific type of merge. > I attached a self-contained shell script that reproduces the problem. > Tested with trunk version of fossil on Linux. > Here is the problem description. > A fossil repository T.fossil contains two brunches "trunk" and "next". > In both branches there are two files "foo" and "bar". At some point in > development process I merge branch next into the trunk. The contents > of the files are such that "fossil merge next" successfully > auto-merges changes in bar but has merge conflicts in foo that has to > be manually resolved. So far so good. > $ fossil cha > UPDATED_BY_MERGE bar > EDITED foo > > The project's internal logic dictates that while fixing merge > conflicts in foo I have to make some changes to bar. > After any changes to "bar" fossil refuses to commit claiming that > "working checkout does not match what would have ended up in the repository". > > I think this behavior is incorrect, for it forces me to commit a > broken state of the project. > Please, run an attached shell script to reproduce the problem. > > --Leo-- > _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
