On Thursday, 16 August 2012 00:20:00 UTC+1, Adam Prescott wrote:
>
> On Wed, Aug 15, 2012 at 11:57 PM, Andrew Gavin 
> <axg...@googlemail.com<javascript:>
> > wrote:
>
>> I would like to reliably carry over the tags from the fetch branches to 
>> the respective branches that I'm going to dcommit.  I thought I could do a 
>> rev-list checking the tree-hash of the commit and making sure that they are 
>> the same for the commit on the fetch-line with the one on the branch I'm 
>> rebasing onto.  But for some reasons, git svn might be part of it, this 
>> isn't reliable.
>>
>> How can I determine which commits correspond to the tagged commits on the 
>> fetch branch (I'm doing a manual rebase -onto at the moment)? Or even 
>> perform a rebase where the tags get copied across? 
>>
>
> How unique are the commit messages? I hope I've got the right idea of what 
> you want, but how about looking at a combination of commit message + author 
> email, perhaps ignoring commits reachable from, say, $(git merge-base 
> feature-branch master)?
>

Thanks Adam, but the commit messages+author are not always unique. I was 
hoping there would be a better way of tracking the commit through the 
rebase: so it wouldn't occasionally break down because commits looked the 
same.  Also svn dcommit adds more information to the message: opening 
another opportunity for bugs to creep in.

I'm going to have to have a play with merge-base, but in this case the two 
branches have no common ancestry (I think)... does merge-base operate on 
the commit hashes?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/Fx6IUB9T8SUJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to