Document git trac try

[paulmasson]

This is taken mostly verbatim from git-trac-command's README.md at
https://github.com/sagemath/git-trac-command

Component: documentation

Author: Paul Masson

Branch/Commit: 01d06c7

Reviewer: Daniel Krenn

Issue created by migration from https://trac.sagemath.org/ticket/22504

[paulmasson]

Branch: u/paulmasson/22504

[paulmasson]

New commits:

764b83c

Add git trac try

[paulmasson]

Commit: 764b83c

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. New commits:

4376fa7

Additional comments

[sagetrac-git]

Changed commit from 764b83c to 4376fa7

[dkrenn]

comment:5

+ If you want to edit the ticket branch (that is, add additional commits) you cannot
+ use ``git trac try``. You must use ``git trac checkout`` to get the actual ticket
+ branch as a starting point.

We could mention the new section introduced in #22451 to say something on how to continue working on an existing ticket.

[dkrenn]

comment:6

Maybe: Should it be stated somewhere, what git trac try actually does in terms of the usual git commands? (Maybe, mentioning that it is similar to git pull could suffice.)

[dkrenn]

Reviewer: Daniel Krenn

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. New commits:

988734d	Merge branch '22504' into 22504-1
01d06c7	Edit and add links

[sagetrac-git]

Changed commit from 4376fa7 to 01d06c7

[paulmasson]

comment:9

Replying to @dkrenn:

Maybe: Should it be stated somewhere, what git trac try actually does in terms of the usual git commands? (Maybe, mentioning that it is similar to git pull could suffice.)

It already states explicitly that the command creates a merge, not a pull. Isn't that clear enough?

[paulmasson]

comment:10

Replying to @dkrenn:

+ If you want to edit the ticket branch (that is, add additional commits) you cannot
+ use ``git trac try``. You must use ``git trac checkout`` to get the actual ticket
+ branch as a starting point.

We could mention the new section introduced in #22451 to say something on how to continue working on an existing ticket.

This section of the manual appears at the very end and is solely about reviewing tickets. I'd rather not complicate the review process by explaining too much about other operations. To that end, I've replaced git trac checkout here with a link to the appropriate section above in the manual. Since #22451 is now in the current beta, I've also added a link to it in the section of this manual on merging. More appropriate there than here because there is already some information on updating Sage to its most current version.

[dkrenn]

comment:11

Replying to @paulmasson:

Replying to @dkrenn:

Maybe: Should it be stated somewhere, what git trac try actually does in terms of the usual git commands? (Maybe, mentioning that it is similar to git pull could suffice.)

It already states explicitly that the command creates a merge, not a pull. Isn't that clear enough?

Ok, I've reread the whole section, and it fits as it is now.

[dkrenn]

comment:12

Replying to @paulmasson:

Replying to @dkrenn:

+ If you want to edit the ticket branch (that is, add additional commits) you cannot
+ use ``git trac try``. You must use ``git trac checkout`` to get the actual ticket
+ branch as a starting point.

We could mention the new section introduced in #22451 to say something on how to continue working on an existing ticket.

This section of the manual appears at the very end and is solely about reviewing tickets. I'd rather not complicate the review process by explaining too much about other operations. To that end, I've replaced git trac checkout here with a link to the appropriate section above in the manual. Since #22451 is now in the current beta, I've also added a link to it in the section of this manual on merging. More appropriate there than here because there is already some information on updating Sage to its most current version.

Fair enough.

[vbraun]

Changed branch from u/paulmasson/22504 to 01d06c7