logo       
Google Custom Search
    AddThis Social Bookmark Button
-->

Re: sub-branch of earlier delta of current branch: msg#00008

Subject: Re: sub-branch of earlier delta of current branch
Thanks for everyone's help. So the summary is the files via aecp (using -branch or even -independent options), resolve undesired merges, and integrate to new branch.

Feature Request !!!

Could this please implemented as a single aegis command. Maybe part of aeclone and/or aedist or something (e.g. aebranch). I think this is a core feature required for an CM/VC tool. i.e. to _easily_ and _reliably_ be able to go back at any point in time, branch off and continue development from that point.

Cheers,
Brendan.


walter franzini wrote:
On 2/2/07, Brendan Simon <Brendan@xxxxxxxxxxxxxxxx> wrote:
Unfortunately this does not allow me to move past the development
state.  ie. aede fails as a "full" aed has not been performed, only a
"partial" aed.
Any other suggestions ?!?

You can try this:

1) aenbr -p foo.1 1
2) aenc -p foo.1.1 -c 10
3) aedb -p foo.1.1 -c 10
4) aecp -p foo.1.1 -c 10 -branch 1 -delta 4
5) aecd -p foo.1.1 -c 10
6) aed

this will generate ,B for files changed between foo.1.D4 and foo.1.D11

7) Now move the ,B files onto sources:

for f in $(find . -name \*,B)
do
    cp $f $(basename $f ,B)
done

8) aecpu -unch

Now, your working directory should be populated with the source files
you may want to modify

ciao


<Prev in Thread] Current Thread [Next in Thread>