On Sun, Feb 03, 2013 at 12:59:08PM +0800, Daniel YC Lin wrote: > I don't know why my repository become two track? > How to solve this?
Have you run fossil sync before that? Are you sure you have dd76 locally? > $ fossil stat > > repository: /home/dlin/fs/abs.fossil > local-root: /home/dlin/prj/nextvod/src/abs/ > checkout: 0cf4b729c29643e5a8e7793e7328693b964edb7d 2013-02-03 04:42:51 > UTC > parent: 627d55889819db66d6bea82b529eee061d906ae6 2013-02-02 05:24:31 > UTC > tags: trunk > comment: for install [base] packages (user: dlin) > > $ fossil merge dd76 > > fossil: cannot find a common ancestor between the current checkout and dd76 > _______________________________________________ > 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
