On Thu, Feb 3, 2011 at 14:45, Jason Merrill wrote:
> Yep, that looks fine.
Thanks. I've added a section on doing merges to the git wiki
(http://gcc.gnu.org/wiki/GitMirror#Merging_SVN_branches).
Now that I finally got it working, this is infinitely simpler than svnmerge.py.
Diego.
On 02/03/2011 02:06 PM, Diego Novillo wrote:
Thanks. I *think* --squash did the trick. I'm hesitant to commit it
now, though. How can I tell what commit log will be used by 'git svn
dcommit'? This is the state of my merged branch. I think this means
I'm OK to commit this with dcommit, right?
On Thu, Feb 3, 2011 at 11:50, Jason Merrill wrote:
> On 02/03/2011 08:03 AM, Diego Novillo wrote:
>>
>> - I wanted to merge branch 'b2' into branch 'b1'
>>
>> $ git checkout b1
>> $ git svn rebase
>> $ git merge b2
>> < ... fix whatever needs fixing in the merge ... >
>> $ git rebase -i @{u}
>
> I
On 02/03/2011 08:03 AM, Diego Novillo wrote:
- I wanted to merge branch 'b2' into branch 'b1'
$ git checkout b1
$ git svn rebase
$ git merge b2
< ... fix whatever needs fixing in the merge ... >
$ git rebase -i @{u}
I'm surprised at the error that you saw, but I'm not surprised that you
had t
On Thu, Feb 3, 2011 at 01:11, Basile Starynkevitch
wrote:
> I am switching to daily use git for the MELT branch. What is the
> command to avoid making the same mistake? Any general clues on using
> git for GCC work is welcome. I did read
> http://gcc.gnu.org/wiki/GitMirror and Dodji dodjiseketeli
On Wed, 2 Feb 2011 14:09:21 -0500
Diego Novillo wrote:
> I would like to apologize for all the bugzilla spam I have caused with
> a recent merge I made. I was committing the merge with 'git svn',
> since I was interested in keeping the commit history. I did not
> realize that this would also co
I would like to apologize for all the bugzilla spam I have caused with
a recent merge I made. I was committing the merge with 'git svn',
since I was interested in keeping the commit history. I did not
realize that this would also commit the svn commit messages with the
PR numbers, causing the mas
