Hello, In order to figure out how to do conflict resolution with fossil, I created a new repository 'central', I added a file to it, then cloned the repository into 'clone1' and 'clone2'. I switched off autosync from all three repositories, then I modified the the same line in central, clone1 and clone2, and committed the changes.
Next, I opened the clone1 repository and tried to push it to central: $ cd test $ fossil open ../clone1 [..checked out main.c..] $ fossil push ../central Now, coming from bazaar I half-expected it to say something along the line of "Your local copy is outdated, please update from central, resolve the conflicts and then push again.". However, instead I got some stats, no error, and it was done (looked very much like what happens when push is successful). But switching to central showed that nothing has changed (no entries in the timeline). I also tried pull and sync (the last which gave slightly more statistics, but no other differences). I was pretty certain the pull operation would say that there were conflicts to resolve, but it didn't. (The plan was to solve the conflict between clone1 and central. Then redo the same procedure between clone2 and central). I suspect that the problem is that my brain is currently too much locked into bazaar-mode. Anyone care to explain the basic work flow required to force a conflict resolution? (Or a link to a site which explains a typical work flow illustrating conflict resolution?) I am using fossil version [1d93222627] 2011-03-01 19:04:32 UTC on NetBSD/amd64 5.0, in case it's relevant, though I assume it's not. Thankful for any clarifications on what basic fossil concepts I have missed. :) _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
