merge with stable
There were a handful of merge conflicts in the wire protocol code due to significant refactoring in default. When resolving the conflicts, I tried to produce the minimal number of changes to make the incoming security patches work with the new code. I will send some follow-up commits to get the security patches better integrated into default.
No related branches found
No related tags found
Showing
- .hgsigs 2 additions, 0 deletions.hgsigs
- .hgtags 2 additions, 0 deletions.hgtags
- hgext/largefiles/uisetup.py 4 additions, 4 deletionshgext/largefiles/uisetup.py
- mercurial/changegroup.py 8 additions, 3 deletionsmercurial/changegroup.py
- mercurial/hgweb/hgweb_mod.py 15 additions, 13 deletionsmercurial/hgweb/hgweb_mod.py
- mercurial/revlog.py 34 additions, 4 deletionsmercurial/revlog.py
- mercurial/wireproto.py 35 additions, 0 deletionsmercurial/wireproto.py
- tests/drawdag.py 2 additions, 1 deletiontests/drawdag.py
- tests/test-annotate.t 11 additions, 5 deletionstests/test-annotate.t
- tests/test-http-bundle1.t 15 additions, 23 deletionstests/test-http-bundle1.t
- tests/test-http-permissions.t 1502 additions, 0 deletionstests/test-http-permissions.t
- tests/test-http.t 17 additions, 25 deletionstests/test-http.t
- tests/test-largefiles-wireproto.t 2 additions, 2 deletionstests/test-largefiles-wireproto.t
- tests/test-lfs-bundle.t 97 additions, 0 deletionstests/test-lfs-bundle.t
- tests/test-lfs.t 1 addition, 1 deletiontests/test-lfs.t
- tests/test-pull-http.t 0 additions, 2 deletionstests/test-pull-http.t
- tests/test-push-http.t 0 additions, 22 deletionstests/test-push-http.t
- tests/test-revlog-raw.py 10 additions, 5 deletionstests/test-revlog-raw.py
Loading
Please register or sign in to comment