[SCM] lives packaging branch, master, updated. debian/1.3.2-3-4-ga00c001

[Harry Rickards]

On 28 April 2010 19:25, Felipe Sateler <fsateler at gmail.com> wrote:
> On Wed, Apr 28, 2010 at 14:17, Harry Rickards <harry at linux.com> wrote:
>> On 28 April 2010 18:57, Felipe Sateler <fsateler at gmail.com> wrote:
>>> On Wed, Apr 28, 2010 at 11:38, Harry Rickards <harry at linux.com> wrote:
>>>> On 28 April 2010 16:30,  <hrickards-guest at users.alioth.debian.org> wrote:
>>>>> The following commit has been merged in the master branch:
>>>>> commit a00c0019ef859d52834bfd75f61046c5a7583650
>>>>> Merge: 7b52094914795b119554c72005f8a71b5b7ff559 521457f7eb1ad6056bd9fa6e68d9062a8214acb4
>>>>> Author: Harry <hrickards at l33tmyst.com>
>>>>> Date:   Wed Apr 28 16:29:55 2010 +0100
>>>>>
>>>>>    Merge branch 'master' of git://git.debian.org/git/pkg-multimedia/lives
>>>>>
>>>> Damn. I had a directory with some changes not in git in, and added a
>>>> new upstream author to debian/copyright. When pushing I got a
>>>> non-fast-foward-error, and I though 'git pull'ing and pushing again
>>>> would fix this. What should I do now? Out of the 4 commits this merge
>>>> has made, only the debian/copyright is needed. Sorry everyone!
>>>
>>> Just revert the changes that are not necessary (git revert <commit>).
>>>
>>
>> Ok, thanks for the advice (learning more than the *very* basics of git
>> is on my todo list). So would I just do 'git revert
>> 4a4bc9db5c3d824edea51495b8b3d2cd860d260c'. That comes up with:
>> fatal: Commit a00c0019ef859d52834bfd75f61046c5a7583650 is a merge but
>> no -m option was given.
>> I'm not sure what to put for the -m option. Should it just be a 1?
>>
>> One of the merges was for the new name I added in debian/copyright
>> (a00c0019ef859d52834bfd75f61046c5a7583650). Do I need to revert this
>> merge and readd the name to debian/copyright or should I just leave it
>> as it is at the moment?
>
> Upon seeing the git log, I'm not really sure you actually want to
> revert anything. Which change (not commit) do you want to revert?
>

4a4bc9db5c3d824edea51495b8b3d2cd860d260c (the merge that added
debian/source/format). This file had already been added by Alessio.
Although it doesn't break anything to have it there twice, I just
thought it would be much cleaner not to have a duplicate commit.

-- 
Harry Rickards - harry at linux.com
Vote Lib Dem - Building a fairer Britain - http://libdems.org.uk