threads / discuss / 43259

Re: StGit metadata grabbing with git clone

Subject: Re: StGit metadata grabbing with git clone

## tl;dr

6 messages between Nov 22, 2006 and Nov 23, 2006.

replies: 5people: 4as markdown or json

Otavio Salvador· Nov 22, 2006, 12:05 UTC · lore

StGit metadata grabbing with git clone

Hello,

I'm a happy user of stgit together with git to maintain a patch queue while I or the company team is working on patches that will be send for merging. Both works great but we're having troubles when we try to clone a stgit repository.

When I clone the repository it grab the source but it loses the metadata. I would like to grab those too. Does anybody has a solution or a trick how I can do that?

-- 
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: otavio@debian.org      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft gives you Windows ... Linux gives

Robin Rosenberg· Nov 22, 2006, 20:29 UTC · re: Otavio Salvador · lore

onsdag 22 november 2006 13:05 skrev Otavio Salvador:

Show 10 quoted lines

> Hello,
>
> I'm a happy user of stgit together with git to maintain a patch queue
> while I or the company team is working on patches that will be send
> for merging. Both works great but we're having troubles when we try to
> clone a stgit repository.
>
> When I clone the repository it grab the source but it loses the
> metadata. I would like to grab those too. Does anybody has a solution
> or a trick how I can do that?

You can copy the repo using rsync or scp instead of git-clone or use stg uncommit after the regular clone.

Petr Baudis· Nov 22, 2006, 21:38 UTC · re: Robin Rosenberg · lore

On Wed, Nov 22, 2006 at 09:29:24PM CET, Robin Rosenberg wrote:

Show 14 quoted lines

> onsdag 22 november 2006 13:05 skrev Otavio Salvador:
> > Hello,
> >
> > I'm a happy user of stgit together with git to maintain a patch queue
> > while I or the company team is working on patches that will be send
> > for merging. Both works great but we're having troubles when we try to
> > clone a stgit repository.
> >
> > When I clone the repository it grab the source but it loses the
> > metadata. I would like to grab those too. Does anybody has a solution
> > or a trick how I can do that?
> 
> You can copy the repo using rsync or scp instead of git-clone or use stg 
> uncommit after the regular clone.

How do you sync them then?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
The meaning of Stonehenge in Traflamadorian, when viewed from above, is:
"Replacement part being rushed with all possible speed."

Robin Rosenberg· Nov 22, 2006, 23:56 UTC · re: Petr Baudis · lore

onsdag 22 november 2006 22:38 skrev Petr Baudis:

Show 17 quoted lines

> On Wed, Nov 22, 2006 at 09:29:24PM CET, Robin Rosenberg wrote:
> > onsdag 22 november 2006 13:05 skrev Otavio Salvador:
> > > Hello,
> > >
> > > I'm a happy user of stgit together with git to maintain a patch queue
> > > while I or the company team is working on patches that will be send
> > > for merging. Both works great but we're having troubles when we try to
> > > clone a stgit repository.
> > >
> > > When I clone the repository it grab the source but it loses the
> > > metadata. I would like to grab those too. Does anybody has a solution
> > > or a trick how I can do that?
> >
> > You can copy the repo using rsync or scp instead of git-clone or use stg
> > uncommit after the regular clone.
>
> How do you sync them then?

1) Don't. You're supposed to share stgit patches via email.

2) Want to mess try anyway?

At first I was thinking NO!, but then again, it might be "interesting" to try it.

You can publish the state of a branch using git push. This will look like the pu branch in the official Git repo, i.e. a branch whose list of commits get changed completely, rather than being appended to. This could be considered sane, ie. you publish the current state of your work.

You can also pull from a stgitted branch. Still sane, if you wan't to look at somebody else's work.

I mentioned uncommit. I'm not sure that was a wise suggestion. If you wan't to push and pull changes. don't uncommit incomming changes and don't pretend to work on the same patch and you'll probably be just fine. .....

Catalin Marinas· Nov 23, 2006, 10:47 UTC · re: Otavio Salvador · lore

Otavio Salvador <otavio@debian.org> wrote:

Show 8 quoted lines

> I'm a happy user of stgit together with git to maintain a patch queue
> while I or the company team is working on patches that will be send
> for merging. Both works great but we're having troubles when we try to
> clone a stgit repository.
>
> When I clone the repository it grab the source but it loses the
> metadata. I would like to grab those too. Does anybody has a solution
> or a trick how I can do that?

Most of the StGIT metadata can be generated by "uncommit" (the reason I still keep a lot of this metadata like author etc. is for speed). However, I'm not sure how well this would work since you can nor synchronise the patches afterwards. StGIT works well for sharing patches via e-mail but you might want to consider topic branches instead of patches (though StGIT seems more convenient).

Another idea is to export the patches (stg export) to a common place and import them in the other tree (stg import --series --replace). I could also add a --sync option to "import", instead of --replace, which would perform a three-way merge with the coresponding local patches so that it grabs any additional changes in both repositories or branches (similar to "pick --fold", option which I added for the same reason).

Yet another idea is a "stg import" command for remote repositories or branches which would bring in the StGIT metadata.

At the bottom of the TODO list is something that would solve this, only that I've never found the time to think about it properly. I work on several branches (and even separate trees) and share patches between them. It would be nice to be able to synchronise the changes to these patches.

Otavio Salvador· Nov 23, 2006, 14:31 UTC · re: Catalin Marinas · lore

Catalin Marinas <catalin.marinas@arm.com> writes:

Show 33 quoted lines

> Otavio Salvador <otavio@debian.org> wrote:
>> I'm a happy user of stgit together with git to maintain a patch queue
>> while I or the company team is working on patches that will be send
>> for merging. Both works great but we're having troubles when we try to
>> clone a stgit repository.
>>
>> When I clone the repository it grab the source but it loses the
>> metadata. I would like to grab those too. Does anybody has a solution
>> or a trick how I can do that?
>
> Most of the StGIT metadata can be generated by "uncommit" (the reason
> I still keep a lot of this metadata like author etc. is for
> speed). However, I'm not sure how well this would work since you can
> nor synchronise the patches afterwards. StGIT works well for sharing
> patches via e-mail but you might want to consider topic branches
> instead of patches (though StGIT seems more convenient).
>
> Another idea is to export the patches (stg export) to a common place
> and import them in the other tree (stg import --series --replace). I
> could also add a --sync option to "import", instead of --replace,
> which would perform a three-way merge with the coresponding local
> patches so that it grabs any additional changes in both repositories
> or branches (similar to "pick --fold", option which I added for the
> same reason).
>
> Yet another idea is a "stg import" command for remote repositories or
> branches which would bring in the StGIT metadata.
>
> At the bottom of the TODO list is something that would solve this,
> only that I've never found the time to think about it properly. I work
> on several branches (and even separate trees) and share patches
> between them. It would be nice to be able to synchronise the changes
> to these patches.

That would be a really nice feature. Besides, would be nice to have a way to plug something on clone and push git methods so you might send all those metadata without much hassle.

-- 
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: otavio@debian.org      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft gives you Windows ... Linux gives