------------------------------------------------------------------------------
To reply, visit https://hellosplat.com/s/beanbag/tickets/4728/
------------------------------------------------------------------------------
New update by KG
For Beanbag, Inc. > RBTools > Ticket #4728
Reply:
@rfs613, You are correct, `git svn rebase -n` is still being called. The
logic is now encapsulated in `rbtools/clients/_get_parent_branch()`. I had not
noticed that. However, that value is not being over here. I think it would be
pretty easy to fix this issue with the following patch to
`rbtools/clients/git.py`
```patch
@@ -141,7 +141,7 @@ class GitClient(SCMClient):
parent_ref = self._rev_parse(self._get_parent_branch())[0]
merge_base = self._rev_list_youngest_remote_ancestor(
- parent_ref, 'origin')
+ parent_ref, self._get_parent_branch())
result = {
'base': parent_ref,
@@ -208,7 +208,7 @@ class GitClient(SCMClient):
'Unexpected result while parsing revision spec')
parent_base = self._rev_list_youngest_remote_ancestor(
- result['base'], 'origin')
+ result['base'], self._get_parent_branch())
if parent_base != result['base']:
result['parent_base'] = parent_base
else:
@@ -556,8 +556,7 @@ class GitClient(SCMClient):
parent links).
"""
local_commits = self._execute(
- [self.git, 'rev-list', local_branch, '--not',
- '--remotes=%s' % remote])
+ [self.git, 'rev-list', local_branch, '--not', remote])
local_commits = local_commits.split()
if local_commits == []:
```
I have not tested this extensively, but it appears to work in simple cases
of `git-svn` and `git` repositories.
--
You received this message because you are subscribed to the Google Groups
"reviewboard-issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at https://groups.google.com/group/reviewboard-issues.
For more options, visit https://groups.google.com/d/optout.
