new contributed stuff: DebFile

Adeodato Simó dato at net.com.org.es
Wed Jul 18 13:52:22 UTC 2007


* Stefano Zacchiroli [Wed, 18 Jul 2007 15:31:12 +0200]:

> I'm considering the lack of feedback on the bright side: no (bad) news,
> good news. So I've just merged the new contributed stuff in our trunk.

15:47 <dato> zack: arg!
15:48 <zack> dato: uh?
15:48 <dato> zack: don't do that! (you probably didn't know, that's okay)
15:48  * zack hides
15:49 <dato> zack: when you merge into trunk something that took several
    iterations (= commits) to do, you normall dont `cd /path/trunk; b pull
    /path/to/branch`, but `cd /path/trunk; b merge /path/to/branch`
15:50 <zack> dato: indeed, I didn't know, and it sounded strange to me, sorry
15:50 <dato> zack: the normal case is that `b pull ` would not even work,
    because there would have been intermediate commits in trunk; but in this case
    there wasn't, so they mainline revs got a bit polluted
15:50 <dato> zack: what about if I fix?
15:51 <zack> dato: if you know how to, which you probably do, go ahead, please

So I'll fix it now.

Cheers,

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
                               Listening to: Presuntos Implicados - Luna




More information about the pkg-python-debian-discuss mailing list