altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity
12944 commits 1 branch 0 tags 2.6 GiB
Commit graph

35 commits

Author SHA1 Message Date
Robert Sparks 59483d60e8 More tweaks to mergedevbranch. 
- Legacy-Id: 19003
 2021-05-18 22:11:22 +00:00
Robert Sparks 1c05b778a4 Merged in [18991] from jennifer@painless-security.com: 
Missing migration needed by [18960] / [18977]
 - Legacy-Id: 19002
Note: SVN reference [18960] has been migrated to Git commit b08110b838

Note: SVN reference [18977] has been migrated to Git commit 6a70e862df

Note: SVN reference [18991] has been migrated to Git commit c09cd8b651
 2021-05-18 18:27:50 +00:00
Robert Sparks 4fe5a51fd7 Removed Henrik from the copy line for mergedevbranch notification at his request. 
- Legacy-Id: 18871
 2021-03-02 15:04:01 +00:00
Robert Sparks 73b771d5a5 Copy both rjsparks and henrik on messages about merged branches. 
- Legacy-Id: 18756
 2020-12-11 20:21:15 +00:00
Robert Sparks 9e4f42f11b Merged in [18748] from rjsparks@nostrum.com: 
Also tweaked mergedevbranch.

    Populate interim approved email correctly. Fixes #3150.
 - Legacy-Id: 18750
Note: SVN reference [18748] has been migrated to Git commit 21b05d003c
 2020-12-11 16:43:15 +00:00
Henrik Levkowetz e80daea644 Minor tweak of output 
- Legacy-Id: 17214
 2020-01-10 12:32:47 +00:00
Henrik Levkowetz 82e270fc82 Added a check for uncomitted changes to bin/mergedevbranch. 
- Legacy-Id: 17213
 2020-01-10 12:29:54 +00:00
Henrik Levkowetz c979b39bad Added some thoughts on using flake8 as part of the merge process. 
- Legacy-Id: 17197
 2020-01-08 14:09:00 +00:00
Henrik Levkowetz 722a60882a Tweaked the bin/mergedevbranch utility command 
- Legacy-Id: 17193
 2020-01-07 17:32:36 +00:00
Henrik Levkowetz 82672519df Undid previous merge 
- Legacy-Id: 16113
 2019-03-28 11:05:25 +00:00
Henrik Levkowetz 6a159ebdfd Merged in [16094] from magnus.westerlund@ericsson.com: 
Added sortable columns to Review Team Reviewers page. Partially addresses issue #2656
 - Legacy-Id: 16112
Note: SVN reference [16094] has been migrated to Git commit 0c0e75861e
 2019-03-28 11:02:52 +00:00
Henrik Levkowetz 1c2f9904e6 Tweaked the bin/mergedevbranch to add a pause to permit fixes to merged code before running tests. 
- Legacy-Id: 15740
 2018-11-09 17:37:28 +00:00
Henrik Levkowetz bf6b8d8ca1 Tweaked bin/mergedevbranch 
- Legacy-Id: 13590
 2017-06-12 22:26:49 +00:00
Henrik Levkowetz d31c58973d Tweaked mergedevbranch to use bin/count 
- Legacy-Id: 13516
 2017-06-04 16:31:10 +00:00
Henrik Levkowetz 51779e923f Tweaked the mergedevbranch script. 
- Legacy-Id: 11442
 2016-06-21 18:55:43 +00:00
Henrik Levkowetz 862808c3e5 Too good to be true. I don't know what the svn merge command does with -x -b, but id doesn't merge without whitespace changes. Reverting the previous change to bin/mergedevbranch. 
- Legacy-Id: 10549
 2015-12-08 00:00:58 +00:00
Henrik Levkowetz afd9b70bbd Added the --ignore-space-change switch to both the svn diff and merge commands in bin/mergedevbranch, to avoid spending time on editors that frivolously changes whitespace. Didn't occur to me earlier that the merge command might be able to do this, but it can. Splendid. 
- Legacy-Id: 10547
 2015-12-07 18:08:01 +00:00
Henrik Levkowetz 0d572316f9 Tweaked bin/mergedevbranch 
- Legacy-Id: 9622
 2015-05-12 04:57:48 +00:00
Henrik Levkowetz a3a6667cd9 Tweaked the mergedevbranch script. 
- Legacy-Id: 8981
 2015-02-04 22:39:25 +00:00
Henrik Levkowetz c63b037461 Tweaked the mergedevbranch script. 
- Legacy-Id: 8977
 2015-02-04 22:21:28 +00:00
Henrik Levkowetz f6e97e721c Tweaked merge script 
- Legacy-Id: 8887
 2015-01-21 19:45:54 +00:00
Henrik Levkowetz a6e4618db6 Ring terminal bell after running test suite in merge script. 
- Legacy-Id: 8878
 2015-01-21 18:47:54 +00:00
Henrik Levkowetz 200f4acd6d Tweaked the bin/mergedevbranch script. 
- Legacy-Id: 8009
 2014-07-01 18:42:03 +00:00
Henrik Levkowetz df77742b93 Tweaked the mergedevbranch script. 
- Legacy-Id: 7934
 2014-06-26 09:42:53 +00:00
Henrik Levkowetz c012be9fc6 Merged in [7843] from rcross@amsl.com: 
Change Type field default on groups search form, from WG to unset.
 - Legacy-Id: 7926
Note: SVN reference [7843] has been migrated to Git commit 61b1755ae5
 2014-06-24 20:50:54 +00:00
Henrik Levkowetz 2718eb31fd Tweaked merge helper script. 
- Legacy-Id: 7530
 2014-03-21 11:24:32 +00:00
Henrik Levkowetz 93e161b2c6 Merged in [7380] from bartosz.balazinski@interdigital.com: 
Changed the URL for some acoount settings from /cookies to /account/settings.

Fixes ticket #806,
 - Legacy-Id: 7385
Note: SVN reference [7380] has been migrated to Git commit af302582b0a9f36941ef15b39bf52c2a51fbafe1
 2014-03-01 18:57:30 +00:00
Henrik Levkowetz 348fa48c2e Updated mergedevbranch script, to be able to add a descriptive commit comment if missing from the original commit message. 
- Legacy-Id: 7384
 2014-03-01 18:49:23 +00:00
Henrik Levkowetz 5171fae532 Additional tweaks to bin/mergedevbranch. 
- Legacy-Id: 7273
 2014-02-19 21:42:08 +00:00
Henrik Levkowetz f3c676cb6d Tweaked the mergedevbranch utility script. 
- Legacy-Id: 7247
 2014-02-16 17:04:33 +00:00
Henrik Levkowetz 47449b6745 Tweaks to the mergedevbranch utility. 
- Legacy-Id: 7229
 2014-02-09 21:29:51 +00:00
Henrik Levkowetz 231034879f Tweaked the mergedevbranch script. 
- Legacy-Id: 5679
 2013-04-21 15:01:53 +00:00
Henrik Levkowetz fc5e944199 Merged [5529] from jmh@joelhalpern.com: 
Add document's notification list to destination email addresses when the document leaves IETF LC.
 - Legacy-Id: 5558
Note: SVN reference [5529] has been migrated to Git commit f81f08cc4a
 2013-03-13 13:39:19 +00:00
Henrik Levkowetz d6b011b0e1 Tweaked mergedevbranch to make the sprint merge/test cycle a little bit easier. 
- Legacy-Id: 5546
 2013-03-10 16:24:47 +00:00
Henrik Levkowetz 032705f100 Moved some utility command-line scripts from test/ to bin/. Added bin/graph-models. 
- Legacy-Id: 5450
 2013-02-24 20:09:01 +00:00
Renamed from test/mergedevbranch (Browse further)