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 ?/\All one has to do is hit the
(15:57:15)  Bac: no, la demo scema\/right keys at the right time


signature.asc
Description: Digital signature
___
vcs-pkg-discuss mailing list
vcs-pkg-discuss@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/vcs-pkg-discuss


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
> system.

Doesn't http://madduck.net/blog/2007.10.03:packaging-with-git/ do
exactly this? It doesn't use git-buildpackage though.

> 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 some other $DVCS?

http://madduck.net/blog/2007.07.11:creating-a-git-branch-without-ancestry/

-- 
 .''`.   martin f. krafft <[EMAIL PROTECTED]>
: :'  :  proud Debian developer, author, administrator, and user
`. `'`   http://people.debian.org/~madduck - http://debiansystem.info
  `-  Debian - when you have better things to do than fixing systems
 
"stab it and steer"
 -- sailor


digital_signature_gpg.asc
Description: Digital signature (see http://martin-krafft.net/gpg/)
___
vcs-pkg-discuss mailing list
vcs-pkg-discuss@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/vcs-pkg-discuss


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 some other $DVCS?

git itself has this in it's history with the "todo" branch. 
Unfortunately, I can't find you a reference to the instructions to do
this at the moment, perhaps someone else can provide them.

Thanks,

James




___
vcs-pkg-discuss mailing list
vcs-pkg-discuss@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/vcs-pkg-discuss