Pergunta

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)

Nenhuma solução correta

Licenciado em: CC-BY-SA com atribuição
Não afiliado a StackOverflow
scroll top