[Piuparts-devel] Bug#652934: Bug#652934: Bug#652934: Packaging piuparts-server

[Holger Levsen]

Hi,

happy gnu year! :-)

On Freitag, 30. Dezember 2011, Dave Steele wrote:
> Sorry for the delay - I have been relatively offline.

Quite common this time at the year :)
 
> It is possible to incorporate the piatti repository into piuparts as a
> git submodule, preserving its history, but you may want to consider
> the ramifications.

yeah... I also don't really like git submodules...

> Let me know if you still want this type of setup, or if you have a
> better way to maintain piatti history.

I did this:

cd $piuparts.git

# create an empty branch 
git symbolic-ref HEAD refs/heads/piatti.git
rm .git/index 
git clean -fdx 
# add piatti.git as new remote
git remote add piatti.git git+ssh://git.debian.org/git/piuparts/piatti.git
git fetch piatti.git
# merge master branch from piatti.git into branch piatti.git of piuparts.git
git merge piatti.git/master

voila. I think this is the way I want to go.

But: this branch has two directories, home and org which probably should be 
moved together with it's README.txt into a subdir, for which we need a 
suitable name. 

Plus, if we make this move now, (I believe) further merges from the piatti.git 
repo will conflict, so best be prepared to redo those moving steps again.

"Though" in principle I'd be happy to do these changes fast+soon, so that we 
can just drop the piatti.git repo and exclusivly run piatti.debian.org with 
code from piuparts.git - so not neccessarily redoing those moving steps at 
all...

_If_ this is the next change to be merged :-) For which I'm happy it to be.


cheers,
	Holger