Skip to content

Commit

Permalink
Merge commit 'jn/svn-fe' of git://github.com/gitster/git into svn-fe
Browse files Browse the repository at this point in the history
* git://github.com/gitster/git:
  vcs-svn: Allow change nodes for root of tree (/)
  vcs-svn: Implement Prop-delta handling
  vcs-svn: Sharpen parsing of property lines
  vcs-svn: Split off function for handling of individual properties
  vcs-svn: Make source easier to read on small screens
  vcs-svn: More dump format sanity checks
  vcs-svn: Reject path nodes without Node-action
  vcs-svn: Delay read of per-path properties
  vcs-svn: Combine repo_replace and repo_modify functions
  vcs-svn: Replace = Delete + Add
  vcs-svn: handle_node: Handle deletion case early
  vcs-svn: Use mark to indicate nodes with included text
  vcs-svn: Unclutter handle_node by introducing have_props var
  vcs-svn: Eliminate node_ctx.mark global
  vcs-svn: Eliminate node_ctx.srcRev global
  vcs-svn: Check for errors from open()
  vcs-svn: Allow simple v3 dumps (no deltas yet)

Conflicts:
	t/t9010-svn-fe.sh
	vcs-svn/svndump.c
  • Loading branch information
Jonathan Nieder committed Feb 26, 2011
2 parents b1c9b79 + 9e8c532 commit a62bbf8
Show file tree
Hide file tree
Showing 7 changed files with 855 additions and 89 deletions.
3 changes: 2 additions & 1 deletion contrib/svn-fe/svn-fe.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

int main(int argc, char **argv)
{
svndump_init(NULL);
if (svndump_init(NULL))
return 1;
svndump_read((argc > 1) ? argv[1] : NULL);
svndump_deinit();
svndump_reset();
Expand Down
Loading

0 comments on commit a62bbf8

Please sign in to comment.