#29806: Ignore bandwidth file lines with "vote=0" -------------------------------------------------+------------------------- Reporter: juga | Owner: juga Type: defect | Status: | merge_ready Priority: Medium | Milestone: Tor: | 0.4.1.x-final Component: Core Tor/Tor | Version: Severity: Normal | Resolution: Keywords: tor-bwauth, 040-backport, | Actual Points: 035-backport, 034-backport, asn-merge, merge- | after-0403-alpha | Parent ID: #28563 | Points: 1 Reviewer: nickm, teor | Sponsor: -------------------------------------------------+-------------------------
Comment (by teor): Hi asn, Here's what you need to do to merge two different pull requests to 0.4.0 and master: (You don't want to merge to 0.3.4 or 0.3.5. That's my job, in a few months time, after a lot of testing!) 1. Merge https://github.com/torproject/tor/pull/821 to maint-0.4.0 2. Merge https://github.com/torproject/tor/pull/822 to master 3. Merge forward Here are the exact steps on the command-line: {{{ $ cd ../maint-0.4.0 $ git merge tor-github/pr/821 Auto-merging src/test/test_dir.c Auto-merging src/feature/dirauth/bwauth.c Merge made by the 'recursive' strategy. changes/ticket29806 | 7 ++++++ src/feature/dirauth/bwauth.c | 8 ++++++- src/test/test_dir.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 changes/ticket29806 $ cd ../tor $ git merge tor-github/pr/822 Merge made by the 'recursive' strategy. changes/ticket29806 | 7 ++++++ src/feature/dirauth/bwauth.c | 8 +++++- src/test/test_dir.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 changes/ticket29806 $ git-merge-forward.sh [+] Fetching origin...success [+] Handling branch release-0.2.9 Handling branch [+] Switching branch to release-0.2.9...success [+] Merging branch origin/release-0.2.9...success [+] Merging branch maint-0.2.9 into release-0.2.9...success [+] Handling branch maint-0.3.4 Handling branch [+] Switching branch to maint-0.3.4...success [+] Merging branch origin/maint-0.3.4...success [+] Merging branch maint-0.2.9 into maint-0.3.4...success [+] Handling branch release-0.3.4 Handling branch [+] Switching branch to release-0.3.4...success [+] Merging branch origin/release-0.3.4...success [+] Merging branch maint-0.3.4 into release-0.3.4...success [+] Handling branch maint-0.3.5 Handling branch [+] Switching branch to maint-0.3.5...success [+] Merging branch origin/maint-0.3.5...success [+] Merging branch maint-0.3.4 into maint-0.3.5...success [+] Handling branch release-0.3.5 Handling branch [+] Switching branch to release-0.3.5...success [+] Merging branch origin/release-0.3.5...success [+] Merging branch maint-0.3.5 into release-0.3.5...success [+] Handling branch maint-0.4.0 Handling branch [+] Switching branch to maint-0.4.0...success [+] Merging branch origin/maint-0.4.0...success [+] Merging branch maint-0.3.5 into maint-0.4.0...success [+] Handling branch release-0.4.0 Handling branch [+] Switching branch to release-0.4.0...success [+] Merging branch origin/release-0.4.0...success [+] Merging branch maint-0.4.0 into release-0.4.0...success [+] Handling branch master Handling branch [+] Switching branch to master...success [+] Merging branch origin/master...success [+] Merging branch maint-0.4.0 into master...success }}} These forward merges were clean merges: {{{ [+] Merging branch maint-0.4.0 into release-0.4.0...success [+] Merging branch maint-0.4.0 into master...success }}} The rest of the merges did not add a merge commit, because there were no changes. If you want to see what the merge looks like, I pushed the updated maint-0.4.0, release-0.4.0, and master to my GitHub: https://github.com/teor2345/tor/branches I added some instructions to the merge policy. https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/MergePolicy?action=diff&version=10 -- Ticket URL: <https://trac.torproject.org/projects/tor/ticket/29806#comment:23> Tor Bug Tracker & Wiki <https://trac.torproject.org/> The Tor Project: anonymity online
_______________________________________________ tor-bugs mailing list tor-bugs@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs