Hgsubversion-fix-for-singledir-repo.diff
Материал из YourcmcWiki
Версия от 22:07, 28 ноября 2009; VitaliyFilippov (обсуждение | вклад) (Новая страница: «<source lang="diff"> --- hgsubversion/pushmod.py 2009-11-18 21:04:05.697192616 +0300 +++ hgsubversion/pushmod.py 2009-11-26 04:14:39.000000000 +0300 @@ -158,...»)
--- hgsubversion/pushmod.py 2009-11-18 21:04:05.697192616 +0300 +++ hgsubversion/pushmod.py 2009-11-26 04:14:39.000000000 +0300 @@ -158,7 +158,7 @@ def commit(ui, repo, rev_ctx, meta, base file_data[file] = base_data, new_data, action def svnpath(p): - return ('%s/%s' % (branch_path, p)).rstrip('/') + return ('%s/%s' % (branch_path, p)).strip('/') changeddirs = [] for d, v1, v2 in extchanges: @@ -181,7 +181,7 @@ def commit(ui, repo, rev_ctx, meta, base new_target_files = [svnpath(f) for f in file_data] for tf, ntf in zip(file_data, new_target_files): - if tf in file_data: + if tf in file_data and tf != ntf: file_data[ntf] = file_data[tf] if tf in props: props[ntf] = props[tf]
