switching versioning from distro only to distro+upstream

2008-03-19 Thread Stefano Zacchiroli
[ the technical aspect of the problem I'm describing is debian+git specific, but the conceptual problem is applicable to every distro/$DVCS, I guess ] I've a git repository which has been used to version only the debian/ dir thus far [1]. Now that we have git and its space efficiency, I want to ve

Re: switching versioning from distro only to distro+upstream

2008-03-19 Thread James Westby
On Wed, 2008-03-19 at 10:28 +0100, Stefano Zacchiroli wrote: > What I would need is the ability to create a separate history line from > scratch, call it "usptream", tie it with the master history with a new > (fake) commit root, and then merge the two into master. Is that possible > with git or so

Re: switching versioning from distro only to distro+upstream

2008-03-19 Thread martin f krafft
also sprach Stefano Zacchiroli <[EMAIL PROTECTED]> [2008.03.19.1028 +0100]: > I've a git repository which has been used to version only the debian/ > dir thus far [1]. Now that we have git and its space efficiency, I want > to version both upstream sources and the debian dir in the very same > syst

Re: switching versioning from distro only to distro+upstream

2008-03-19 Thread Stefano Zacchiroli
Thanks to all who have replied, with the branch with no ancestry trick I've indeed solved the issue. -- Stefano Zacchiroli -*- PhD in Computer Science ... now what? [EMAIL PROTECTED],cs.unibo.it,debian.org} -<%>- http://upsilon.cc/zack/ (15:56:48) Zack: e la demo dema ?/\Al