diff options
| author |  Jan Pešta <jan.pesta@certicon.cz> | 2013-03-07 12:28:14 +0100 |
|---|---|---|
| committer |  Eric Wong <normalperson@yhbt.net> | 2013-03-08 09:46:03 +0000 |
| commit | 47543d161ebe550c412d99aaa6b9e7e5ae88fab5 (patch) | |
| tree | 756dc24d722d082ddcf65deba292d27f5c842441 /diffcore-pickaxe.c | |
| parent | Git 1.8.2-rc3 (diff) | |
| download | tgif-47543d161ebe550c412d99aaa6b9e7e5ae88fab5.tar.xz | |
git svn: ignore partial svn:mergeinfo
Currently this is cosmetic change - the merges are ignored, becuase the methods
(lookup_svn_merge, find_rev_before, find_rev_after) are failing on comparing text with number.
See http://www.open.collab.net/community/subversion/articles/merge-info.html
Extract:
The range r30430:30435 that was added to 1.5.x in this merge has a '*' suffix for 1.5.x\www.
This '*' is the marker for a non-inheritable mergeinfo range.
The '*' means that only the path on which the mergeinfo is explicitly set has had this range merged into it.
Signed-off-by: Jan Pesta <jan.pesta@certicon.cz>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions