[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCHES] Docs on automatic dependency tracking
From: |
Stefano Lattarini |
Subject: |
Re: [PATCHES] Docs on automatic dependency tracking |
Date: |
Sat, 21 Aug 2010 19:40:17 +0200 |
User-agent: |
KMail/1.13.3 (Linux/2.6.30-2-686; KDE/4.4.4; i686; ; ) |
On Saturday 21 August 2010, Ralf Wildenhues wrote:
> * Stefano Lattarini wrote on Sat, Aug 21, 2010 at 01:49:37PM CEST:
> > On Saturday 21 August 2010, Ralf Wildenhues wrote:
> > > FWIW, somehow you managed to apply these two patches separately
> > > to each of these branches, instead of merging them all from
> > > maint.
> >
> > Ouch, that's true... how could this be possible? I cannot
> > immagine what error I might have done to cause this mess... Do
> > you have idea? I'd like to avoid such blunders in the future,
> > and a possible explanation of the present blunder might be
> > helpful in this regard.
>
> Maybe you invoked 'git rebase' across a merge commit?
Possible... I can't remember precisely, though.
> That effectively removes the merge and duplicates the
> previously-merged commits, unless you use -p aka.
> --preserve-merges. I've never tried -p.
>
> > Sorry for all this,
>
> It's no big deal at all, esp. since you're doing the work.
That's not a good excuse for messing up the automake official repo.
> I just wanted to make you aware of it.
Good idea.
This problem indicates that `git --dry-run' is not enough for me to
check the correctness of the push; do you know if there is a way to
show which commits are added to which branches during a push
(while still in `dry-run' mode, obviously)?
Regards,
Stefano
- [PATCHES] Docs on automatic dependency tracking (was: Testing a new compiler with Automake "simple tests"), Stefano Lattarini, 2010/08/17
- Re: [PATCHES] Docs on automatic dependency tracking (was: Testing a new compiler with Automake "simple tests"), Ralf Wildenhues, 2010/08/17
- Re: [PATCHES] Docs on automatic dependency tracking, Stefano Lattarini, 2010/08/17
- Re: [PATCHES] Docs on automatic dependency tracking, Ralf Wildenhues, 2010/08/18
- Re: [PATCHES] Docs on automatic dependency tracking, Stefano Lattarini, 2010/08/18
- Re: [PATCHES] Docs on automatic dependency tracking, Ralf Wildenhues, 2010/08/21
- Re: [PATCHES] Docs on automatic dependency tracking, Stefano Lattarini, 2010/08/21
- Re: [PATCHES] Docs on automatic dependency tracking, Ralf Wildenhues, 2010/08/21
- Re: [PATCHES] Docs on automatic dependency tracking,
Stefano Lattarini <=
- Re: [PATCHES] Docs on automatic dependency tracking, Ralf Wildenhues, 2010/08/22
- Re: [PATCHES] Docs on automatic dependency tracking, Stefano Lattarini, 2010/08/24