The vendor branches section of the book was written before Subversion grew
support for foreign repository merges. If I was rewriting that section now,
I would absolutely mention this feature.
1. 'svn export' the remote branch.
2. 'svn import' the branch stuff into your own repository. Actually, I'd
recommend doing a local 'svn add' and 'svn commit' so you have the chance to
make sure the properties on the files and directories match those in the
foreign repository (see below). In either case, record the version of the
remote code that you're importing.
3. Make your customizations as normal, cimmit, etc.
4. When you need to sync up your mirror, just use:
$ svn merge FOREIGN-URL_at_MIRRORED-REV \
FOREIGN-URL_at_HEAD \
mirror-working-copy
(where MIRRORED-REV was the revision of the code you imported or
last merged, of course).
It has some gotcha:
* renames in the foreign repository can really interfere with the merges
that bring them into your own repository.
* you have to make sure that when you make your initial import of the
remote code that your auto-props don't set props on the files in your
repository differently than they are in the remote one (or you run the
risk of future conflicts)
* there's no merge tracking support.
But I use this feature myself to maintain vendor branches, and I've been
pretty happy with the results.
分享到:
相关推荐
主要介绍了windows下Idea使用git clone failed. Could not read from remote repository.,本文给大家介绍的非常详细,对大家的学习或工作具有一定的参考借鉴价值,需要的朋友可以参考下
在.NET开发领域,"dotnet-Repository測試使用LocalDB"这一主题主要涉及的是软件设计模式中的Repository模式以及数据库管理中的LocalDB技术。Repository模式是一种常用的设计模式,它为业务逻辑层提供了对数据访问的...
git push -f remote-deploy-repo localBranch:remoteBranch 安装 npm install -g 这将在您的$ PATH中放入一个名为deploy-by-push的二进制文件。 调用时,它需要在git repo的根目录中有一个名为deploy.conf的文件。 ...
jar包 java
解决docker报错The push refers to a repository
1、工具作用:清理本地和远程maven仓库repository中的无效或者垃圾版本文件lastUpdated、_maven.repositories*、_remote.repositories; 2、使用方法1:在本地仓库repository文件夹中右键,打开Git Bahs Here命令...
The `git fetch` command retrieves changes from a remote repository, and `git checkout -b <branch-name> origin/<remote-branch>` creates a local branch from a remote branch. - **Remote Collaboration**:...
A work-in-progress repository for breaking the security of iOS 11.2 up to 11.2.6 .zip,A work-in-progress repository for breaking the security of iOS 11.2 up to 11.2.6
在Java开发中,"remoteRepository"通常指的是远程仓库,这是软件开发中的一个重要概念,尤其是在使用版本控制系统如Git时。远程仓库允许开发者将本地项目代码同步到一个中央存储库,这样团队成员可以共享代码,协同...
在本案例中,"maven local repository"是指在使用Maven进行项目构建时,安装tesseract库并将其添加到本地仓库的过程。 Tesseract是一个开源的OCR(光学字符识别)引擎,可以识别图像中的文本。JNI(Java Native ...
maven的setting配置文件中mirror和repository的区别 Maven是一个流行的Java项目管理和构建工具,它的setting配置文件中有两个重要概念:mirror和repository。这两者都是Maven下载依赖包和插件的关键组件,但它们的...
From a remote Maven repository (jcenter). From a local .aar file. 1. Setup from a remote Maven repository (jcenter) Add compile 'io.github.kexanie.library:MathView:0.0.6' into dependencies sec
repository
标题 "Just a basic repository for learning git" 暗示了这是一个关于学习 Git 的基础资源库。Git 是一个分布式版本控制系统,广泛用于软件开发和其他需要跟踪文件更改的项目。这个压缩包可能包含了各种教程、示例...
Repository包含Local Repository、Remote Repository和Mirror Repository等层次。Local Repository是项目构建时首选的依赖来源,而Remote Repository则用于备份和更新。Mirror Repository是远程仓库的镜像,用于提高...
Towards UCI+: A mindful repository design
第一步 重新生成ssh ssh-keygen -t rsa -C “这里需要填写邮箱。我填写的是我的绑定主邮箱。我想其他邮箱也是可以的,只不过我没有测试。” 第二步 查看你生成的公钥 cat ~/.ssh/id_rsa.pub 然后我们就可以看到我们...
maven_local_repositorymaven_local_repositorymaven_local_repositorymaven_local_repositorymaven_local_repositorymaven_local_repositorymaven_local_repositorymaven_local_repositorymaven_local_...