On Fri, Jul 18, 2008 at 11:57 AM, Brett Cannon <[EMAIL PROTECTED]> wrote:
> On Fri, Jul 18, 2008 at 11:37 AM, Brett Cannon <[EMAIL PROTECTED]> wrote:
>> On Fri, Jul 18, 2008 at 11:12 AM, Brett Cannon <[EMAIL PROTECTED]> wrote:
>>> On Thu, Jul 17, 2008 at 11:54 PM, Neil Schemenauer <[EMAIL PROTECTED]>
>>> wrote:
>>>> [back on the list]
>>>>
>>>> On Thu, Jul 17, 2008 at 11:24:16PM -0700, Brett Cannon wrote:
>>>>> Turned out to be a rebuild::
>>>>>
>>>>> ....
>>>>> r65077 = 82d954e8c20c91562c4c660859d17756cba10992
>>>>> r65082 = 1c75cce93c2ef2ec87e801888638cfdf5d2ff29a
>>>>> r65085 = 3143c2fbe7315afd29496dc0cdac3122bed30536
>>>>> Done rebuilding
>>>>> .git/svn/git-svn/.rev_map.6015fed2-1504-0410-9fe1-9d1591cc4771
>>>>>
>>>>> How do I know what is going to be sent? ``git log`` seems to suggest
>>>>> something by not listing a git-svn-id for my last commit, but is that
>>>>> really the best I got?
>>>>
>>>> The command
>>>>
>>>> git log git-svn..
>>>>
>>>
>>> And those two periods are significant for people who think they are
>>> line noise. Damn is Git quirky.
>>>
>>
>> OK, so I decided to trying committing through Git by doing ``git svn
>> dcommit``. But it told me that Misc/NEWS was out of date. So I then
>> did ``git fetch git-svn`` with a ``git merge git-svn``, which I
>> realize now is a mistake since I am used to other DVCSs using "merge"
>> for when there are changes and "update" when there are none.
>>
>> So Git tells me there is a conflict; fine. I go in, fix the file, and
>> then try to commit Misc/NEWS. It says I can't do a partial commit, I
>> have to commit everything; fine. So I do a full commit, but now I get:
>>
>> Misc/NEWS: needs merge
>> Misc/NEWS: unmerged (3dc56ad4e5918676358c4e20be738b37ce8d50d0)
>> Misc/NEWS: unmerged (ad4c19cecfb584be37d8b9c138791daa83ad9285)
>> Misc/NEWS: unmerged (853df55fc6ac71bcea0eb340a8ab52b348db9e8c)
>> error: Error building trees
>>
>> This is not winning me over on the usability side of things. =) So
>> what do I do now to get this tree back in a usable state so I can
>> commit (although, thanks to ``git show``, I might patch a svn checkout
>> so I don't have to wait on this)?
>>
>
> I figured this out. I just did ``git reset --hard``, did the proper
> "fetch;rebase" dance, resolved the conflict, did ``git add`` and then
> continued with the rebase. It all looks fine now.
>
I lied. Trying again complained about Mac/IDLE/Makefile.in which I
have not touched, nor is it listed as changed. OK, so I deleted it in
hopes that "fetch; rebase" would fix it; nope. So I did another ``git
reset --hard``, but I am still stuck with being told that
Mac/IDLE/Makefile.in is out of date::
Committing to svn+ssh://svn.python.org/python/trunk ...
M Mac/IDLE/Makefile.in
Transaction is out of date: Out of date:
'/python/trunk/Mac/IDLE/Makefile.in' in transaction '65108-1' at
/unix/bin/git-svn line 461
So I don't know how to deal with this since Git does not even list the
file as being modified.
-Brett
_______________________________________________
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe:
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
