문제

We did following ugly thing:

svn history

So, how can we achieve another reintegrate?

What did I try so far?

  • well, the obvious merge - which fails brutally!
  • creating a patch and apply it to trunk (which should work, as it diffs the files with no svn only...)
  • creating another branch @ trunk r101 and merge all the changes from first branch - fails brutally :)

edit:

merge-infos for trunk do not show any merged revisions of the desired branch (as I've rolled them back with r101)

올바른 솔루션이 없습니다

라이센스 : CC-BY-SA ~와 함께 속성
제휴하지 않습니다 StackOverflow
scroll top