Re: StGit question
- From
- Catalin Marinas <catalin.marinas@gmail.com>
- Date
- Sep 12, 2008, 22:18 UTC
- Message-ID
- <b0943d9e0809121518p38f60733v3857fa66ac80d152@mail.gmail.com>
- In-Reply-To
- <b0943d9e0809121515v53c6d593o8211b3cbbb8dfba4@mail.gmail.com>
On 12/09/2008, Catalin Marinas <catalin.marinas@gmail.com> wrote:
Show 14 quoted lines
> On 12/09/2008, Clark Williams <clark.williams@gmail.com> wrote: > > Most of the time it's not more than one or two patches difference, so I think that it > > can be handled manually for now. I'll definitely keep an eye on sync and merge though... > > > As Karl said, we have some plans to allow collaboration between > multiple StGit repositories but we didn't have much time to look at it > recently. Karl's "merge" stuff looks promising though. > > What "sync" does is that it allow the same set of patches between two > branches to be synchronised in case modifications happened on one of > these branches. In your situation, you would have to fetch the remote > branch, uncommit as in Karl's method and either import or sync the > remote patches with those on your local branch.
BTW, "sync" allows synchronisation with a series of patches stored in a directory. So you can also share patches using exported repositories with import and sync.
-- Catalin