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

[John Meinel]

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

For those who are interested (such as myself) this is the previous thread:
http://lists.gnu.org/archive/html/gnu-arch-users/2003-11/msg00085.html

This thread has a few discussions, so the sub-thread of importance
starts here:
http://lists.gnu.org/archive/html/gnu-arch-users/2003-11/msg00093.html

To me, Tom's reply here:
http://lists.gnu.org/archive/html/gnu-arch-users/2003-11/msg00100.html

is reasonable as to why it wasn't done explicitly. He also mentions in
the thread adding an {arch}/=upstream, but how in some configurations
this doesn't have a meaning (hub instead of spoke).

My suggestion is just more of "caching" the last star-merge rather that
trying to auto-generate a correct one. ({arch}/++last-star-merge) Maybe
it's better done in an over-arch as Tom suggests.

Hey abentley, I wouldn't mind trying to create an aba script for this,
what do you think a good name would be? merge-hist? star-merge-hist?
repeat-merge? And if I did it, would you accept it into aba?

Thanks,
John
=:->

Colin Walters wrote:

| On Mon, 2004-07-12 at 14:41 -0400, James Blackwell wrote:
|
|
|>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 suggested this a while back, and even came up with a changeset, but it
| was rejected.  I still think it's a good idea, but I do understand why
| it was rejected.
|

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFA8vlnJdeBCYSNAAMRArlcAJ4248zjgurNYawdQKu+bE0zOqVyXwCgz8v9
VMzagX1nGakd+/1xa1sPJ74=
=hBTH
-----END PGP SIGNATURE-----