On Fri, Jan 13, 2012 at 15:03, Simon Riggs <simon@2ndquadrant.com> wrote:
> On Fri, Jan 13, 2012 at 1:39 PM, Dave Page <dpage@pgadmin.org> wrote:
>> On Fri, Jan 13, 2012 at 1:29 PM, Simon Riggs <simon@2ndquadrant.com> wrote:
>>> On Fri, Jan 13, 2012 at 1:22 PM, Robert Haas <rhaas@postgresql.org> wrote:
>>>
>>>> Typo fix.
>>>
>>> Hmm, how strange. I fixed that bug immediately before commit, so must
>>> have skipped a step while committing.
>>
>> If you modify a file after git-adding it, you have to re-add it before
>> committing. Possible cause?
>
> No, dumber than that.
>
> I compiled a new version, just skipped the bit where I updated the new
> patch version, so the old one just got applied.
>
> I keep separate dev and write repositories and use patches to move
> between them. Which gives me less chance of committing dev code
> accidentally (like I just did). Is there a better way?
Just FWIW, I use a separate development repository as well. But I have
it added as a remote from the "commit repository", and thus just do a
"git merge --squash" instead of manually moving them with "patch".
But I am very much a fan of keeping the repos separate for just that
reason - don't want to accidentally commit dev code.
--
Magnus Hagander
Me: http://www.hagander.net/
Work: http://www.redpill-linpro.com/