Re: [Gnu-arch-users] Default version for star-merge

[John Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I agree. I personally support a dual archive system (one uses extra
short names for win32 compatibility), and basically I only star_merge
back and forth between the trees. I wrote a wrapper script that tells
what archive I'm in, and deduces what the alternative is, but if it just
remembered the tagged parent, I think it would be sufficient. (There is
the star-merge back issue.)
Another alternative would be something like {arch}/++star-merger, that
maybe remembers the last archive that you star-merged from (and could be
initialized with the tag parent.) Then repeatedly star-merging is not as
difficult.

John
=:->

PS> Sorry about earlier copying you directly James, I'll try not to in
the future.

James Blackwell wrote:
| I very recently taught a friend how to use arch. A day later, he came back
| to me and essentially asked: Since star-merge is commonly used to merge
| changes from the version you originally tagged from, why not make
| the default version to star-merge the version you tagged from.
|
| My initial reaction was a knee jerk one; the concept of parentage is much
| too weak to have any sort of default version for a tool like star-merge.
|
| But the more I thought about it, with a star topology, there really is a
| parent-child relationship between the center of the star and the spokes.
| Whats more, the idea that changes propogate both ways is a naive one; for
| each person at the center of the star that is star-merging/cherry picking
| from his spokes, there are anywhere from one to dozens of people merging
| from him.
|
| Considering how star-merge happens to have a common case (the spoke
| star-merging from center), then we can easily locate a sane default
| argument for star-merge -- the version that we originally tagged from.
|
| I actually think this is a good idea. Doing this slightly encourages
| people to follow their parent tree a little closer.
|
| Regards,
| James
|
|
|
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFA8t3oJdeBCYSNAAMRAh2WAJ0f+0M10Zyn8BWRo3qMJ4KgHd7nhwCfeAvi
60RrCzZnOUWbIb9OEry/vK8=
=dxGL
-----END PGP SIGNATURE-----