[Kde-scm-interest] How to handle conversion errors

Oswald Buddenhagen ossi at kde.org
Sun Feb 28 01:16:40 CET 2010


On Sun, Feb 28, 2010 at 12:31:17AM +0100, Thiago Macieira wrote:
> Em Domingo 28. Fevereiro 2010, às 00.08.15, Andreas Pakulat escreveu:
> > Well, its ugly compared to those tags that don't have additional changes
> > merged in. That is I have this:
> > 
> > master
> > *    --warnings
> > |  * <v3.9.95> merge r1014461
> > | /
> > *   increase Qt requirement
> > 
> > But I'd rather like to have:
> > 
> > master
> > *
> > |
> > * <v3.9.95> r1014461
> > |
> > * increase Qt requirement.
> 
> You should have thought of that before moving the tag in Subversion.
> 
> You can't have that in Git because that's not what happened.
> 
well, he can just rebase master on top of the moved tag ... i'm sure it
wouldn't take more than an hour. :D



More information about the Kde-scm-interest mailing list