Thus said john lunzer on Sun, 05 Feb 2017 13:06:04 -0500: > Here is the test sequence: > > cd fossils > fossil new testrepo.fossil > mkdir ../testrepo > cd ../testrepo > fossil open ../fossils/testrepo.fossil > fossil branch new myfirstbranch trunk > fossil commit --allow-empty --branch myfirstbranch -m "A new branch" > fossil commit --allow-empty --branch myfirstbranch -m "A new branch, > again?" > fossil update trunk > fossil merge myfirstbranch > fossil commit -m "merged myfirstbranch" > fossil branch ls > fossil merge myfirstbranch --force > fossil commit -m "merged myfirstbranch" --allow-empty > ... > I believe this is a bug. I'm bewildered as to how to resolve this situation.
I believe nobody mentioned one low-hassle way that resolve this situation is to update to that branch and run fossil merge. This is done anytime you end up with a fork in trunk (or any branch for that matter): $ fossil up myfirstbranch ------------------------------------------------------------------------------- checkout: 286e7146246a71139eb512510f7cacb729dde91a 2017-02-09 14:17:35 UTC tags: myfirstbranch comment: A new branch, again? (user: amb) changes: None. Already up-to-date WARNING: multiple open leaf check-ins on myfirstbranch: (1) 2017-02-09 14:17:35 [286e714624] (current) (2) 2017-02-09 14:15:32 [e07533879c] $ fossil merge Merging fork [e07533879c] at 2017-02-09 14:15:32 by amb: "Create new branch named "myfirstbranch"" $ fossil commit -m resolved New_Version: 4af67471394a024d13b339df440f60d7b3e0b4b6 $ fossil update trunk ------------------------------------------------------------------------------- checkout: e32235e4845f01c072b0f3c83211a89ab99b6fbe 2017-02-09 14:17:50 UTC tags: trunk comment: merged myfirstbranch (user: amb) changes: None. Already up-to-date $ fossil merge --integrate myfirstbranch $ fossil commit -m done Closed: 4af67471394a024d13b339df440f60d7b3e0b4b6 New_Version: 8ad174708464929a4870310f076cf82955260ea7 Andy -- TAI64 timestamp: 40000000589c7b5d _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
