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

[Dave Steele]

On Sun, Jan 1, 2012 at 7:20 AM, Holger Levsen <holger at layer-acht.org> wrote:

>
> 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.
>
>
I want to make sure I have the workflow right, to get the history you want.
So I should:

 - Create the branch you describe
 - Massage the files to match my org and home directory tree
 - Commit the changes
 - Merge to the server branch (a null operation this time)
 - move/merge org, home, and README.txt, to, say, the piatti directory in
piuparts
 - and commit

so that the timeline is maintained in piatti.git, until such time that you
wish to retire that branch. Until then, there is a merge/copy process to
get the work done in the reference piatti.git branch into piuparts. Is that
right?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/piuparts-devel/attachments/20120101/5ae81a11/attachment.html>