diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-06-27 19:39:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-28 03:20:50 -0700 |
| commit | c1927a8554284d0dc5bb7fcf8e79d3877e4a497c (patch) | |
| tree | 231da5f4e8817bd8486ba0c332fae3d4dd14ede5 /t/t4100-apply-stat.sh | |
| parent | dc62e25cbd0ec1726d5108a8caa539e60492cc7a (diff) | |
| download | git-c1927a8554284d0dc5bb7fcf8e79d3877e4a497c.tar.gz git-c1927a8554284d0dc5bb7fcf8e79d3877e4a497c.tar.xz | |
git-svn: several graft-branches improvements
The 'graft-branches' command can now analyze tree matches for
merge detection after commits are done, when --branch or
--branch-all-refs options are used.
We ensure that tree joins (--branch and --branch-all-refs
options) during commit time only add SVN parents that occurred
before the commit we're importing
Also fixed branch detection via merge messages, this manner of
merge detection (a la git-svnimport) is really all fuzzy, but at
least it actually works now :)
Add some new tests to go along with these fixes, too.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4100-apply-stat.sh')
0 files changed, 0 insertions, 0 deletions