Mercurial > hg
comparison mercurial/simplemerge.py @ 14388:37c997d21752
patch: stop handling hunkless git blocks out of stream
Patch changes are emitted by iterhunks() in two separate events: 'file' when
hunks have to be applied and 'git' to describe other modifications like copies
or mode changes. Note that a file which mode is changed and which content is
modified by the same patch will be emitted in both events. It is more
convenient to handle all file modifications in a single event. This patch
"zips" git actions with regular changes so both kinds can be emitted at the
same place.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 19 May 2011 22:44:01 +0200 |
parents | abaacdab38f6 |
children | 48ec0763afbb |
comparison
equal
deleted
inserted
replaced
14387:e1b4a7a7263a | 14388:37c997d21752 |
---|