On Tue, Dec 17, 2013 at 5:36 AM, Jeroen Demeyer <[email protected]> wrote:
> On 2013-12-17 13:08, John Cremona wrote:
>>
>> But to review a ticket we need to know how far back to
>> go in this, and how do we do that?
>
> +1, very good question. I also think that this is a major missing feature
> from sage-git. With the obsolete system of patches on Trac, at least one
> could easily see the code belonging to a given ticket.
git log ticket ^master
will give you the list of commits in ticket not in master
git log ticket ^master ^dep1 ^dep2 ...
will also exclude commits that occur in the dependencies. git log -p
will give each diff. It would be really nice if this were
automatically computed and links to each commit diff was given on trac
in a standard location. Also
git diff $(git merge-base master ticket) ticket
will the consolidated diff of ticket against the master branch at the
point it was branched off (or the last merge). If there's a single
dependency, substitute that for master. If there are many
(non-transitive) dependencies you'd probably have to merge all the
deps into a common branch first, e.g.
git checkout -b all_deps dep1
git merge dep2
...
git diff $(git merge-base all_deps ticket) ticket
I think this is the sage -dev gather.
- Robert
--
You received this message because you are subscribed to the Google Groups
"sage-git" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
