简体   繁体   中英

After moving SVN server, TortoiseSVN doesn't save mergeinfo after merge

After moving our SVN server to a completely different machine, at a different path, I just found out that all of our development team cannot merge correctly anymore.

Specifically, the problem is somewhat similar to that of this question , however this does not seem to be a path case sensitivity issue.

More into details, here is what we are currently using:

  • Subversion: 1.8.16 (32 bit)
  • ToitoiseSVN: 1.9.4 (64 bit)
  • Server: moved from Ubuntu 12 (32 bit) to Windows 10 (64 bit)

As I said, this issue is similar to the one in the linked question, however in this case I have checked the repository path in the local working copy and the path from which the merge is done, and they are identical.

I have also tried doing a fresh checkout, but still no luck: TortoiseSVN says that the working copy properties were updated, but really weren't.

合并后,TortoiseSVN表示工作副本属性已更新

When committing the merge, in fact, I do not see the property update.

这里缺少工作副本上的属性

If I add them manually, then all goes well.

属性手动更新

What can I do to solve this problem, short of manually recording mergeinfo each and every time?

in the first image it see you are merging from 20.0.1.45 to your local copy.. I think you should reverse source and target of your merging



update after clearing in the comments...

I would do all branching/merging operations directely on server and then work on a local copy of the branched version with normal command chekout and commit.

In this way, if several programmers are working on the same branch, then they can share their changes and work with classical update,checkout and commit operations.

So, in your case, if your local project point to the trunk I simply update/checkout from trunk to local, otherwise merge on the svn server project which you are pointing to, commit the merge, and then update in your local copy.

I'd want to thank @CiroCorvino for his help, both though comments and chat, but in the end I found the issue.

The problem seems due to the fact that we not only moved the server, but also went from subversion 1.6 to 1.8

Running the command svnadmin upgrade /path/to/repository seems to have solved the problem, and now the subversion mergeinfo is saved correctly and automatically.

The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM