Opened 5 years ago

Closed 4 years ago

#22504 closed enhancement (fixed)

Document git trac try

Reported by: paulmasson Owned by:
Priority: major Milestone: sage-7.6
Component: documentation Keywords:
Cc: Merged in:
Authors: Paul Masson Reviewers: Daniel Krenn
Report Upstream: N/A Work issues:
Branch: 01d06c7 (Commits, GitHub, GitLab) Commit: 01d06c7790e1ef11e961fa3015d70a9856d952a4
Dependencies: Stopgaps:

Status badges

Description (last modified by slelievre)

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

Change History (15)

comment:1 Changed 5 years ago by paulmasson

  • Description modified (diff)

comment:2 Changed 5 years ago by paulmasson

  • Branch set to u/paulmasson/22504

comment:3 Changed 5 years ago by paulmasson

  • Commit set to 764b83ce0572618241d96170ea0122a077aa6eca
  • Status changed from new to needs_review

New commits:

764b83cAdd git trac try

comment:4 Changed 5 years ago by git

  • Commit changed from 764b83ce0572618241d96170ea0122a077aa6eca to 4376fa7a03b1ceacd9a4d4b29dd5b1ef2e279503

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

4376fa7Additional comments

comment:5 follow-up: Changed 5 years ago by 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.

comment:6 follow-up: Changed 5 years ago by 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.)

comment:7 Changed 5 years ago by dkrenn

  • Reviewers set to Daniel Krenn

comment:8 Changed 5 years ago by git

  • Commit changed from 4376fa7a03b1ceacd9a4d4b29dd5b1ef2e279503 to 01d06c7790e1ef11e961fa3015d70a9856d952a4

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

988734dMerge branch '22504' into 22504-1
01d06c7Edit and add links

comment:9 in reply to: ↑ 6 ; follow-up: Changed 5 years ago by 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?

Last edited 5 years ago by paulmasson (previous) (diff)

comment:10 in reply to: ↑ 5 ; follow-up: Changed 5 years ago by 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.

Last edited 5 years ago by paulmasson (previous) (diff)

comment:11 in reply to: ↑ 9 Changed 5 years ago by dkrenn

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.

comment:12 in reply to: ↑ 10 Changed 5 years ago by dkrenn

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.

comment:13 Changed 5 years ago by dkrenn

  • Status changed from needs_review to positive_review

comment:14 Changed 4 years ago by slelievre

  • Description modified (diff)

comment:15 Changed 4 years ago by vbraun

  • Branch changed from u/paulmasson/22504 to 01d06c7790e1ef11e961fa3015d70a9856d952a4
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.