[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: Default version for star-merge
From: |
James Blackwell |
Subject: |
Re: [Gnu-arch-users] Re: Default version for star-merge |
Date: |
Mon, 12 Jul 2004 18:46:32 -0400 |
> > From: John Meinel <address@hidden>
>
> > What about the ++star-merge fix? (Keep a file that remembers what the
> > last branch you star-merged from).
Tom Lord:
> That's closer to the variation on the idea that I'd like to see and is
> roughly in keeping with plans. There is still more design work to be
> done on it though.
>
> For one thing, my hunch is that I sometimes want that data to be
> versioned, not tree-specific.
>
Tom Lord wrote:
> For another thing: should an upstream branch have a set of reverse
> pointers to downstream branches from which merging commonly takes
> place?
I suppose we could keep a =meta-info/=merged-from that lists branches
that we have merged from, and then we could do something like...
[*BIG* lightbulb]:
tla star-merge (regex)
and only perform the star-merge if the regex matches exactly one line in
=merged-from (or some other file that lists fully qualified versions
we've merged from)
Oh. I like that idea. It works both ways and I could *easily* imagine
using that for a variety of archive names.
Even better. Imagine *this* :
tla star-merge jblack/t.*rbrowse
( replacing tla star-merge address@hidden/tla--rbrowse )
tla get lo.*4/tla--d
( replacing tla get address@hidden/tla--devo )
tla rbrowse lord.*/tla
( replacing tla rbrowse address@hidden/tla )
Whadaya say?
Tom Lord again:
> For another thing: the pointer to the other branch might not be all
> that we want to record. For example, there may be a rule for
> how/where to submit a merge request back to upstream. Perhaps these
> additional but related parameters should be planned for here as well.
Are you worried that might make arch a little too smart for its own
good?
--
James Blackwell Try something fun: For the next 24 hours, give
Smile more! each person you meet a compliment!
GnuPG (ID 06357400) AAE4 8C76 58DA 5902 761D 247A 8A55 DA73 0635 7400
- [Gnu-arch-users] Default version for star-merge, James Blackwell, 2004/07/12
- [Gnu-arch-users] Re: Default version for star-merge, Stefan Monnier, 2004/07/12
- Re: [Gnu-arch-users] Re: Default version for star-merge, John Meinel, 2004/07/12
- Re: [Gnu-arch-users] Re: Default version for star-merge, Tom Lord, 2004/07/12
- Re: [Gnu-arch-users] Re: Default version for star-merge,
James Blackwell <=
- Re: [Gnu-arch-users] Re: Default version for star-merge, Tom Lord, 2004/07/12
- [Gnu-arch-users] Re: Default version for star-merge (and more), James Blackwell, 2004/07/13
- Re: [Gnu-arch-users] Re: Default version for star-merge (and more), William Dode, 2004/07/13
- Re: [Gnu-arch-users] Re: Default version for star-merge (and more), Scott Parish, 2004/07/13
- Re: [Gnu-arch-users] Re: Default version for star-merge (and more), Andrew Suffield, 2004/07/13
- [Gnu-arch-users] Re: Default version for star-merge (and more), Stefan Monnier, 2004/07/13
- Re: [Gnu-arch-users] Re: Default version for star-merge (and more), James Blackwell, 2004/07/13
- Re: [Gnu-arch-users] Re: Default version for star-merge (and more), Colin Walters, 2004/07/13
- Re: [Gnu-arch-users] Re: Default version for star-merge (and more), Scott Parish, 2004/07/13
- Re: [Gnu-arch-users] Re: Default version for star-merge (and more), Aaron Bentley, 2004/07/13