On 07.03.2012 16:53, Ethan Jucovy wrote: > Caching in GitPlugin is broken. > Don't enable it if you use branches ;) It will miss commits. > > > Thanks, I hadn't realized that. > > I am using branches so I'd like to know how/when this will be broken for me.
If you have commits in two branches and merge them only commits from one branch will be inserted into cache. It is because trac's sync function assumes a linear repository (svn). In effect you get entries in revision log without message, anonymous author and age 42 years. > Is there a ticket describing the problem? I though there was, but I don't see either. Simple reproduce case below: $ cat break.sh #! /bin/sh git checkout cache-test-1 git merge --no-ff cache-test-2 echo "haha" >> file-in-branch-1 git add file-in-branch-1 git commit -m "commit A in branch 1" echo "haha" >> file-in-branch-1 git add file-in-branch-1 git commit -m "commit B in branch 1" git push origin cache-test-1 git checkout cache-test-2 echo "haha" >> file-in-branch-2 git add file-in-branch-2 git commit -m "commit A in branch 2" echo "haha" >> file-in-branch-2 git add file-in-branch-2 git commit -m "commit B in branch 2" git merge --no-ff cache-test-1 git push origin cache-test-2 I have a semi-working solution in progress, but I don't have time ATM to finish it. -- silk -- You received this message because you are subscribed to the Google Groups "Trac Users" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/trac-users?hl=en.
