1

I have trunk and branch codebases in the repository and locally.

Currently I was testing on local branch and when testing was ok I reintegrated branch from repository into local trunk.

Now I was told that before reintegrate I need to do synch from trunk to the branch.

Can I reintegrate from local branch into local trunk or I have to commit after sync into branch in repository and then do reintegrate?

I believe that I can do 'local' reintegrate but I am not 100% sure if this is safe.

Using: Subversion command-line client, version 1.7.8.

Radek
  • 13,813
  • 52
  • 161
  • 255

1 Answers1

1

You'll have to commit the update coming from trunk to your local copy of branch back to the branch in SVN first. Then you reintegrate from this repo to your local copy of trunk which you then commit once you are satisfied with it.

Yes, it is confusing.

500 - Internal Server Error
  • 28,327
  • 8
  • 59
  • 66
  • Does it mean no? Why do I have to commit first? Why cannot I reintegrate from local branch? I cannot see any difference between my local branch and branch in remore repository after committing. That's why I asked. – Radek May 16 '13 at 06:32
  • I see no reason why you could not in principle but it does not appear to be supported. – 500 - Internal Server Error May 16 '13 at 13:39
  • 1
    When I try 'reintegrate' from local copy I get `svn: E195002: A working copy merge source needs an explicit revision` – Radek May 20 '13 at 00:26