We had a similar situation last week: Fossil server hosting many repos, two active clients on one repo.
Clients A and B were both working on the same branch simultaneously. Client A commits (commit 1) Client B tries to commit, gets conflict warning. Client B runs fossil update Client B commits successfully Timeline on server shows two leaves with the same tag. Client B never sees commit 1.. Running any combination of pull update rebuild does not work. The commit message for 1 is not present in the database. In the end, I resolved this by re-cloning from the server. Note we've been doing parallel commits on the branch for a while. And this has only happened once, both clients use auto sync. I was going to chalk this up to cosmic particles or similar, but it sounds as of it might be related. Thanks Steve On 18 Aug 2013 16:51, "Michai Ramakers" <m.ramak...@gmail.com> wrote: > On 18 August 2013 17:43, Stephan Beal <sgb...@googlemail.com> wrote: > > On Sun, Aug 18, 2013 at 5:20 PM, Michai Ramakers <m.ramak...@gmail.com> > > wrote: > >> > >> 1) on host S: clone project from host S (http://S/my_repo) > >> 2) on host C: clone project from host S (http://S/my_repo) > >> 3) on host C: do some work, and commit changes > >> 4) on host S, 'fossil up' > >> 5) on host S: 'fossil timeline' doesn't show the recent commit > >> 6) on host S: 'fossil pull' doesn't show the commit either in 'fossil > >> timeline' > >> 7) on host C: do more work, and commit changes > >> 8) on host 'S': 'fossil up'; now all recent commits are seen > > > > > > It sounds almost like you have autosync turned off - do 'up' and 'pull' > show > > any network traffic? > > Tbh I forgot - the error-situation is gone now, sadly. > > >> Related question: I typically use 'fossil up', and never 'fossil sync' > >> (or pull/push) in my workflow, working on 2 hosts on the same project > >> - should I? > > > > > > That doesn't sound wrong. If autosync is on there is rarely a need for > > push/pull. Do an 'up' when you start working, to make sure you aren't > > working from what would become a fork, and it will sync/push when you > commit > > (if autosync is on). > > Right. > > If it comes up again, I'll try to keep it as-is, if that's possible, > and post it on here - who knows. > > Michai > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
