[Kde-scm-interest] [PATCH] scripty draft 1

[Thiago Macieira]

Em Terça-feira 26 Maio 2009, às 17:56:52, Chani escreveu:
> On May 26, 2009 08:45:52 Thomas Zander wrote:
> > On Tuesday 26. May 2009 09.18.43 Chani wrote:
> > > -I'm not sure if I should rebase when I pull, just in case strange
> > > things have happened to the git repo. maybe only if the first pull
> > > fails?
> >
> > The only commits you ever will create in this repo are the translation
> > update right?
>
> "this repo" being a git kde module (like, say, amarok) - the only commits
> should be adding translations to .desktop files.
>
> > In that case --rebase will not be harmful since it will have no effect if
> > you don't have any non-pushed commits.
> > In short;
> > * if the commits have to go back to svn, rebase is non-optional.
>
> ummm... what? there's no svn involved in the git repository. are we on the
> same page here?
>
> > * if you made a change that rebase can't handle but merge would, then
> > rebase is probably not wanted.
>
> so if scripty changes desktop files in amarok, and then someone else
> changes a desktop file in amarok, git pull might be able to deal with it
> but git pull -- rebase might not?
>
> > I bet you should just rebase to keep a clean and simple history.
>
> except for the above issue. hrm.

I'd say there's no need for pull or rebase.

You should do this:
git fetch $REPOSITORY
git clean -x -d -f
git reset --hard $REPOSITORY/$BRANCH
[ apply changes ]
git commit -m "Scripty changes" -a
git push $REPOSITORY $BRANCH

If the push fails, discard work and try again next time.

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Software
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20090526/0b8b8a64/attachment.sig