[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: [tor-bugs] #27662 [Core Tor/Tor]: refactor networkstatus_parse_vote_from_string()
#27662: refactor networkstatus_parse_vote_from_string()
-------------------------------------------------+-------------------------
Reporter: cyberpunks | Owner: (none)
Type: defect | Status:
| needs_revision
Priority: Medium | Milestone: Tor:
| 0.3.6.x-final
Component: Core Tor/Tor | Version:
Severity: Normal | Resolution:
Keywords: technical-debt, refactor, long- | Actual Points:
functions, cthulhucode |
Parent ID: #22408 | Points:
Reviewer: | Sponsor:
-------------------------------------------------+-------------------------
Comment (by teor):
Replying to [comment:8 cyberpunks]:
> Replying to [comment:7 teor]:
> > This branch conflicts with some changes in master.
>
> It actually doesn't, the branch was already rebased a good while ago.
I opened a pull request at:
https://github.com/torproject/tor/pull/427
GitHub says:
{{{
This branch has conflicts that must be resolved
Use the web editor or the to resolve conflicts.
Conflicting files
src/feature/dirparse/ns_parse.c
}}}
When I try to do the merge manually, there are conflicts:
{{{
$ git checkout -b parsevotesplit1-master tp/master
Branch 'parsevotesplit1-master' set up to track remote branch 'master'
from 'tp'.
Switched to a new branch 'parsevotesplit1-master'
$ git merge onionk/parsevotesplit1
Auto-merging src/feature/dirparse/ns_parse.h
Auto-merging src/feature/dirparse/ns_parse.c
CONFLICT (content): Merge conflict in src/feature/dirparse/ns_parse.c
Recorded preimage for 'src/feature/dirparse/ns_parse.c'
Automatic merge failed; fix conflicts and then commit the result.
Exit 1
}}}
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/27662#comment:9>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs