summaryrefslogtreecommitdiff
path: root/Documentation/howto/using-merge-subtree.txt
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-05-26 01:51:38 -0500
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-05-26 02:02:44 -0500
commit9ecfa8ae4c6701cae85c4f22fdfacffe22d8a75e (patch)
tree0eb9fa67421fe2c89f1262a2c92de01f4e042729 /Documentation/howto/using-merge-subtree.txt
parentMerge commit 'v1.7.5' into svn-fe (diff)
parentvcs-svn: avoid using ls command twice (diff)
downloadtgif-9ecfa8ae4c6701cae85c4f22fdfacffe22d8a75e.tar.xz
Merge branch 'db/vcs-svn-incremental' into svn-fe
This teaches svn-fe to incrementally import into an existing repository (at last!) at the expense of less convenient UI. Think of it as growing pains. This opens the door to many excellent things, and it would be a bad idea to discourage people from building on it for much longer. * db/vcs-svn-incremental: vcs-svn: avoid using ls command twice vcs-svn: use mark from previous import for parent commit vcs-svn: handle filenames with dq correctly vcs-svn: quote paths correctly for ls command vcs-svn: eliminate repo_tree structure vcs-svn: add a comment before each commit vcs-svn: save marks for imported commits vcs-svn: use higher mark numbers for blobs vcs-svn: set up channel to read fast-import cat-blob response Conflicts: t/t9010-svn-fe.sh vcs-svn/fast_export.c vcs-svn/fast_export.h vcs-svn/repo_tree.c vcs-svn/svndump.c
Diffstat (limited to 'Documentation/howto/using-merge-subtree.txt')
0 files changed, 0 insertions, 0 deletions