Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
6
Merge Requests
6
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
ffeeb901
Commit
ffeeb901
authored
May 26, 2011
by
Julien Muchembled
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify procedure to update upstream branch
parent
a8a872ea
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
+3
-7
00.REPOSITORY.README.txt
00.REPOSITORY.README.txt
+3
-7
No files found.
00.REPOSITORY.README.txt
View file @
ffeeb901
...
...
@@ -14,14 +14,10 @@ upstream is clone of all http://svn.zope.org/repos/main/zc.buildout/trunk
commits, it is updated from time to time by using (NOTE: Still work in progress):
git clone
Put in .git/config:
git svn init --no-minimize-url -T http://svn.zope.org/repos/main/zc.buildout/trunk
git update-ref refs/remotes/trunk origin/upstream
[svn-remote “svn”]
url = http://svn.zope.org/repos/main/zc.buildout/trunk
fetch = :refs/remotes/git-svn
git show origin/upstream | head -n 1 | cut -d ‘ ’ -f 2 > .git/refs/remotes/git-svn
git show origin/upstream | head -n 1 | cut -d ‘ ’ -f 2 > .git/refs/remotes/trunk
git checkout -b upstream origin/upstream # or git checkout upstream
git svn rebase
git push
...
...
Łukasz Nowak
@luke
mentioned in commit
57e5a60d
·
May 31, 2017
mentioned in commit
57e5a60d
mentioned in commit 57e5a60d90fdf26e2bd54e112021ab2bfad3efe8
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment