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

[Thiago Macieira]

Em Domingo 28. Fevereiro 2010, às 01.16.40, Oswald Buddenhagen escreveu:
> 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

Or if there's a commit in the master tree that matches the tag, you can move 
the tag in Git after the conversion (i.e., delete it and tag the other 
commit).

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      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: 190 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20100228/fcc493bb/attachment.sig