[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: missing & star-merge
From: |
Milan Cvetkovic |
Subject: |
Re: [Gnu-arch-users] Re: missing & star-merge |
Date: |
Wed, 05 May 2004 11:56:06 -0400 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.3.1) Gecko/20030425 |
Aaron Bentley wrote:
Milan Cvetkovic wrote:
I am not sure how to retrieve "18" without running "star-merge".
replay $package-version--patch-18. star-merge isn't the appropriate
tool for that. apply-delta can do pretty much anything if you don't mind
a lot of typing. ("apply-delta $package-version--patch-17
$package-version--patch-18" has the same effect as "replay
$package-version--patch-18")
OK, I know that, but it is not what I meant when I wrote "how to retrieve".
In other words, what is the way to find out the revision which is
"common ancestry" for star-merge, which in example before I had assumed
was patch-18 (or patch-20, when I look more ?)
I have a problem with star-merge that I don't know what it is going to
do before I run it. I can go around it by running apply-delta and replay
since I do know how they work, and their parameters are explicit.
But when I run star-merge, I have no clue where is
"common-ancestry-revision".
example repeated:
i.e. if the above example is extend - say patch-20 is a merge from you,
replay will replay 12-16,18-23
replay --skip-present will do 12-16,18-19,21-23
replay --new will do 18-23
replay --new --skip-present will do 18-19,21-23
Thanks, Milan.
Aaron
- [Gnu-arch-users] missing & star-merge, Jani Monoses, 2004/05/05
- Re: [Gnu-arch-users] missing & star-merge, Matthieu Moy, 2004/05/05
- Re: [Gnu-arch-users] missing & star-merge, Miles Bader, 2004/05/05
- Re: [Gnu-arch-users] missing & star-merge, Jani Monoses, 2004/05/05
- [Gnu-arch-users] Re: missing & star-merge, Stig Brautaset, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge, Robert Collins, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge, Stig Brautaset, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge, Milan Cvetkovic, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge, Aaron Bentley, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge,
Milan Cvetkovic <=
- Re: [Gnu-arch-users] Re: missing & star-merge, Aaron Bentley, 2004/05/05
- Re: [Gnu-arch-users] Re: missing & star-merge, Jani Monoses, 2004/05/06
- [Gnu-arch-users] Re: Re: missing & star-merge, Stig Brautaset, 2004/05/05