I think it is a bug in fossil. Bellow git work flow for compassion. Best, Anofos
>>>> git init . Initialized empty Git repository in /tmp/git_test/.git/ >>>> echo "a" > a >>>> echo "b" > b >>>> git add a b >>>> git commit -m "a b" [master (root-commit) aa9af4a] a b 2 files changed, 2 insertions(+) create mode 100644 a create mode 100644 b >>>> git checkout -b branch2 Switched to a new branch 'branch2' >>>> git mv b c >>>> ls a c >>>> git commit -m "b -> c" [branch2 32afd71] b -> c 1 file changed, 0 insertions(+), 0 deletions(-) rename b => c (100%) >>>> echo "b2" > b >>>> git add b >>>> git commit -m "b2" [branch2 e72cfde] b2 1 file changed, 1 insertion(+) create mode 100644 b >>>> git checkout master Switched to branch 'master' >>>> git merge branch2 Updating aa9af4a..e72cfde Fast-forward b | 2 +- c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 c >>>> ls -al razem 12 drwxr-xr-x 3 as as 120 maj 2 00:10 . drwxrwxrwt 49 root root 2420 maj 2 00:08 .. -rw-r--r-- 1 as as 2 maj 2 00:09 a -rw-r--r-- 1 as as 3 maj 2 00:10 b -rw-r--r-- 1 as as 2 maj 2 00:10 c drwxr-xr-x 8 as as 280 maj 2 00:10 .git >>>> 2015-05-01 18:59 GMT+02:00 Richard Hipp <d...@sqlite.org>: > Tnx. I'm busy chasing unrelated issues in SQLite at the moment. I'll > look into this when I get a chance. > > On 5/1/15, Fossil User <fossil.scm.u...@gmail.com> wrote: > > This >>>> is a bash prompt. > > > > > > >>>> fossil init repo > > project-id: fb0c7719bbe9fa2723a658b8f729cf287c2d3df7 > > server-id: 608b8566ad457edc073e16a3cd7175f7b36a8bd0 > > admin-user: as (initial password is "702370") > > >>>> fossil open repo > > project-name: <unnamed> > > repository: /tmp/merge/repo > > local-root: /tmp/merge/ > > config-db: /home/as/.fossil > > project-code: fb0c7719bbe9fa2723a658b8f729cf287c2d3df7 > > checkout: 380ff0133ab47f54d71a7aa8cbb0a67d708bc8ec 2015-05-01 > 16:07: > > 15 UTC > > leaf: open > > tags: trunk > > comment: initial empty check-in (user: as) > > check-ins: 1 > > >>>> echo "a" > a > > >>>> echo "b" > b > > >>>> fossil add a b > > ADDED a > > ADDED b > > >>>> fossil commit > > vi "./ci-comment-476E1CDF606A.txt" > > New_Version: 641e11cd2c5990dd5817284f81da2035449d7d08 > > >>>> fossil branch new b trunk > > New branch: 8e3aa59de9a7c1427d901e4ebe4cac60b963e889 > > >>>> fossil co b > > a > > b > > >>>> fossil branch > > * b > > trunk > > >>>> mv b c > > >>>> fossil mv b c > > RENAME b c > > >>>> fossil commit > > vi "./ci-comment-940692954A7B.txt" > > New_Version: 56e70776f4a435e4fb81a42ca5033811cf6c07da > > >>>> ls > > a c repo > > >>>> echo "??" > b > > >>>> ls > > a b c repo > > >>>> fossil add b > > ADDED b > > >>>> fossil commit > > vi "./ci-comment-F6312B62FC0A.txt" > > New_Version: dc8246bfe50b243aaf9e69a1c18146db29829031 > > >>>> fossil co trunk > > a > > b > > >>>> fossil merge b > > RENAME b -> c > > "fossil undo" is available to undo changes to the working checkout. > > >>>> ls > > a c repo > > >>>> fossil timeline > > === 2015-05-01 === > > 16:10:06 [dc8246bfe5] new b (user: as tags: b) > > 16:09:32 [56e70776f4] b -> c (user: as tags: b) > > 16:08:56 [8e3aa59de9] Create new branch named "b" (user: as tags: b) > > 16:08:36 [641e11cd2c] *CURRENT* a b (user: as tags: trunk) > > 16:07:15 [380ff0133a] initial empty check-in (user: as tags: trunk) > > +++ no more data (5) +++ > > >>>> fossil branch > > b > > * trunk > > >>>> fossil commit > > vi "./ci-comment-B0BE822ED2B5.txt" > > New_Version: e3662c7508e1bd3a725a36eff0e3416dbf363ce7 > > >>>> fossil close > > > > > > 2015-05-01 18:29 GMT+02:00 Richard Hipp <d...@sqlite.org>: > > > >> On 5/1/15, Fossil User <fossil.scm.u...@gmail.com> wrote: > >> > 3 should be create and switch to branch b > >> > > >> > Please see attached file, it is full console text dump. > >> > > >> > >> This mailing list strips attachments. Please paste in-line. > >> -- > >> D. Richard Hipp > >> d...@sqlite.org > >> _______________________________________________ > >> fossil-users mailing list > >> fossil-users@lists.fossil-scm.org > >> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > >> > > > > > -- > D. Richard Hipp > d...@sqlite.org > _______________________________________________ > 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
