Add parameter to specify CVS_RSH for cvs operations
In order to perform operations through SSH, CVS checks the environment variable “CVS_RSH”.
The only way to specify a particular identity file to use with SSH+CVS (for examle) is to have a wrapper script like
#!/bin/bash ssh -i /path/to/identity
and have CVS_RSH point to this wrapper.
This changeset adds the neccessary parameter to the CVS provider: https://github.com/webfactory/puppet-vcsrepo/commit/d86524343b2cc365b43d8239993620ba5e182659
#3 Updated by Matthias Pigulla over 1 year ago
The problem is i made a topic branch, but off my “master”, which is ahead of puppetlabs/puppet-vcsrepo. So the pull req contains more changes than necessary.
So the question is: How can I make a topic branch starting at the right position and isolate the commit (already pushed) on it?
#4 Updated by Ken Barber over 1 year ago
- Status changed from Unreviewed to Accepted
Try something like the following (back up your directory first – ie. make a copy):
git remote add upstream git://github.com/puppetlabs/puppet-vcsrepo git pull upstream master:master git push origin master:master # optionally - but it will up-date your copy (as long as origin is your copy) git checkout <topic branch> git rebase -i master
At this point you select the commit you want – if there are other commits in that list that don’t belong to you remove them in the editor.
git log --graph
And you should see the correct line of history. If its good, do:
git push origin +<topic_branch>:<topic_branch>
(the + is to force it).