On Fri, Mar 4, 2011 at 5:58 AM, Jan Danielsson <[email protected]> wrote: > 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). > <snip>
I've made you test... and after I push from first clone, it give no error at all like there's no conflict. But when I look at the main timeline (with fossil ui) on central, the change from first clone create a new leaf. Without any tag or branch name.. it fork from previous version into a leaf and both leaf are in trunk. I'm using "Fossil version [184500e46a] 2011-02-21 22:26:00" on Mac OS 10.6. -- Martin _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
