[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: Mixing star-merge and selective replay
From: |
Stefan Monnier |
Subject: |
[Gnu-arch-users] Re: Mixing star-merge and selective replay |
Date: |
16 Apr 2004 14:07:04 -0400 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 |
> b5 b6 b7 b8 b9
> branch ------+---+----|-----|-------+----------
> / \ /
> m1 / \ m2 / m3
> / \ /
> main -|----+-------|---+----|-----+----------
> p20 p21 p22 p23 p24 p25
> When I star merge back to main in m2, ANCESTOR is p21, FROM is b6, and
Hmm... p21 is indeed the wrong ancestor: it is the ancestor that should be
used when merging p22 to b7, bot not b6 to p23.
But p21 would be the right ancestor if you were to say "OK branch is now
mature, I want to merge it into main and be done with it".
Looks like I should go back and re-read the star-merge doc.
Stefan
- [Gnu-arch-users] Re: Mixing star-merge and selective replay, (continued)
- [Gnu-arch-users] Re: Mixing star-merge and selective replay, Neil Stevens, 2004/04/15
- Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay, Matthieu Moy, 2004/04/15
- [Gnu-arch-users] Re: Mixing star-merge and selective replay, Julian T. J. Midgley, 2004/04/15
- Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay, Tom Lord, 2004/04/15
- [Gnu-arch-users] Re: Mixing star-merge and selective replay, Julian T. J. Midgley, 2004/04/16
- [Gnu-arch-users] Re: Mixing star-merge and selective replay, Stefan Monnier, 2004/04/16
- [Gnu-arch-users] Re: Mixing star-merge and selective replay, Julian T. J. Midgley, 2004/04/16
- Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay, Aaron Bentley, 2004/04/16
- [Gnu-arch-users] Re: Mixing star-merge and selective replay,
Stefan Monnier <=
Re: [Gnu-arch-users] Mixing star-merge and selective replay, Aaron Bentley, 2004/04/15
- [Gnu-arch-users] Re: Mixing star-merge and selective replay, Neil Stevens, 2004/04/15
- Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay, Aaron Bentley, 2004/04/15
- Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay, Tom Lord, 2004/04/15
- Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay, Aaron Bentley, 2004/04/15
- Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay, Miles Bader, 2004/04/15
- Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay, Miles Bader, 2004/04/15
- Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay, Tom Lord, 2004/04/16
- Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay, Tom Lord, 2004/04/16
Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay, David Allouche, 2004/04/21