[tor-bugs] #9553 [Tor]: Please bump tor version in maint-* branches as part of the release process
Tor Bug Tracker & Wiki
blackhole at torproject.org
Thu Aug 22 13:39:16 UTC 2013
#9553: Please bump tor version in maint-* branches as part of the release process
-------------------------+--------------------------------------------------
Reporter: karsten | Owner:
Type: enhancement | Status: new
Priority: normal | Milestone:
Component: Tor | Version:
Keywords: | Parent:
Points: | Actualpoints:
-------------------------+--------------------------------------------------
Comment(by nickm):
That said, bumping the version in maint-0.2.4 and manually resolving the
conflict through careful use of "merge -s ours" is not very hard; it's
what I do for Libevent.
The main point where we were running into trouble when we decided to use
the current system was in ChangeLog conflicts.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/9553#comment:2>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list