[tor-bugs] #22314 [Metrics/Atlas]: Ignore git mergetool backup files

[Tor Bug Tracker & Wiki]

#22314: Ignore git mergetool backup files
---+-
 Reporter:  cypherpunks|  Owner:  irl
 Type:  defect | Status:  new
 Priority:  Medium |  Milestone:
Component:  Metrics/Atlas  |Version:
 Severity:  Normal |   Keywords:
Actual Points: |  Parent ID:
   Points: |   Reviewer:
  Sponsor: |
---+-
 I use the git mergetool for handling merge conflicts. The tool leaves
 `.orig` files as backups to the original files. These files make `git
 status` complain about untracked files and, in my case, highlights this in
 the terminal.

--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #22314 [Metrics/Atlas]: Ignore git mergetool backup files

[Tor Bug Tracker & Wiki]

#22314: Ignore git mergetool backup files
---+--
 Reporter:  cypherpunks|  Owner:  irl
 Type:  enhancement| Status:  needs_review
 Priority:  Medium |  Milestone:
Component:  Metrics/Atlas  |Version:
 Severity:  Normal | Resolution:
 Keywords: |  Actual Points:
Parent ID: | Points:
 Reviewer: |Sponsor:
---+--
Changes (by cypherpunks):

 * status:  new => needs_review
 * type:  defect => enhancement


Comment:

 The attached patch creates the `.gitignore` file and adds the `orig`
 extension to be ignored.

--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #22314 [Metrics/Atlas]: Ignore git mergetool backup files

[Tor Bug Tracker & Wiki]

#22314: Ignore git mergetool backup files
---+-
 Reporter:  cypherpunks|  Owner:  irl
 Type:  enhancement| Status:  merge_ready
 Priority:  Medium |  Milestone:
Component:  Metrics/Atlas  |Version:
 Severity:  Normal | Resolution:
 Keywords: |  Actual Points:
Parent ID: | Points:
 Reviewer: |Sponsor:
---+-
Changes (by irl):

 * status:  needs_review => merge_ready


Comment:

 This looks good to me. Will probably add Vim swap files into this when I
 merge.

 Thanks.

--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #22314 [Metrics/Atlas]: Ignore git mergetool backup files

[Tor Bug Tracker & Wiki]

#22314: Ignore git mergetool backup files
---+
 Reporter:  cypherpunks|  Owner:  irl
 Type:  enhancement| Status:  closed
 Priority:  Medium |  Milestone:
Component:  Metrics/Atlas  |Version:
 Severity:  Normal | Resolution:  fixed
 Keywords: |  Actual Points:
Parent ID: | Points:
 Reviewer: |Sponsor:
---+
Changes (by irl):

 * status:  merge_ready => closed
 * resolution:   => fixed


Comment:

 Merged.

--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs