Re: StGit question

From: Karl Hasselström <kha@treskal.com>
Date: Sep 12, 2008, 07:51 UTC
Message-ID: <20080912075116.GA26685@diana.vm.bytemark.co.uk>
In-Reply-To: <48C94F86.6080707@gmail.com>

On 2008-09-11 12:04:06 -0500, Clark Williams wrote:

> Are there any guidelines or best-practices for sharing StGit trees?

See below. ;-)

Show 15 quoted lines

> I'm working with the Linux -rt patchset and I need to be able to
> share my tree with other people. What I'd *like* to do is push git
> tree's up to a git server, let other people fetch them and have them
> be able to 'stg uncommit' to get back to my stack state. The problem
> is that when someone uncommits, you lose the patch names. If you're
> trying to create an RPM out of a stack, this causes problems :).
>
> Is there something I can do or something that we can do to StGit to
> make it possible for an 'uncommit' to restore the original patch
> name? It looks like I could modify the commit message, so that the
> first line is the patch name, but that's not very nice for people
> scanning commits.
>
> Or am I missing something completely trivial that will make my life
> easier?

You've probably already found this and dismissed it, but

  $ stg uncommit foo bar baz woo wee aaahh

will uncommit six patches and give them those names. So if you just share the output of

  $ stg series --applied --noprefix

along with your branch, the other end will be able to recreate a series with the same names. (In not-quite-bleeding-edge stg's, "series --applied" is spelled "applied".)

As for merging your work once both of you have made changes to the series, the current solution is "stg sync", which you'll have to ask Catalin about. The patch stack log in my experimental branch is designed to allow for true 3-way merging of patch series, so that you'd be able to get your colleague's latest modifications with a simple "stg merge" command, but that merge currently exists only in a couple of mails to this list -- there isn't even a prototype implementation -- so I expect you'll have more luck with "stg sync" right now ...

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle