Subversion 将未版本控制的项目文件添加到工作副本 [英] Subversion adding unversioned project files to working copy

问题描述

我有一个项目，calendars，由许多不同的开发人员参与.我决定使用 Subversion 将项目置于版本控制之下，但与此同时，这些不同的开发人员继续独立于我处理他们的未版本化文件.

<前>开发人员 A 开发人员 B 我标题.h 标题.h 标题.htimer.c timer.c timer.c时区.c 时区.c日历.c .svn

我的问题是，我如何使他们的更改与我的一致，存储库位于远程服务器上?

我的想法是开发人员 A 和 B 必须从存储库中签出，但是他们如何将自己的文件与他们在提交回存储库之前签出的文件合并?

解决方案

因为他们的项目没有版本控制，他们必须手动合并更改.这是不可避免的，但只能做一次.应该尽快完成.

• 将当前项目 X 重命名为 X_old
• 结帐 X
• 单独比较每个文件(WinMerge 对此很有用)，并将更改从 X_old 更改为 X，处理每个文件中的每一行
• 最后提交更改

开发人员应该将他们的项目按顺序进行版本控制，以尽量减少冲突.

I have a project, calendars, that has been worked on by a number of different developers. I decided to place the project under version control using Subversion, but in the meantime these different developers continued to work on their unversioned files independently of me.

Developer A      Developer B       Me

header.h         header.h          header.h
timer.c          timer.c           timer.c
timezones.c                        timezones.c
calendars.c                        .svn

My question is, how do I bring their changes in line with mine, where the repository is on a remote server?

My thinking is that Developers A and B would have to check out from the repository, but then how would they merge their own files with the ones they have checked out before then committing back to the repository?

解决方案

Because their projects are not versioned they must merge changes manually. It is unavoidable, but it is only done once. It should be done as soon as possible.

• rename current project X to X_old
• checkout X
• compare each file individually (WinMerge is good for that), and bring changes from X_old to X, taking care of each different line in each file
• in the end commit changes

Developers should bring their projects to version control sequentially to minimize conflicts.

这篇关于Subversion 将未版本控制的项目文件添加到工作副本的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！