Sun 17 Aug 2003 03:15:21 AM UTC, original submission:
-unavailable- (Alexander Deruwe) wrote:
> Hey all. Some questions about 'new-on-branch'...
>
> Assumption: after I replay exactly 1 patch from another branch in my
> working directory (without previous changes), 'new-on-branch' should
> show just that patch.
>
> How come 'new-on-branch' does not do that? ;) Am I missing its point?
> When I run 'new-on-branch' in my aderuwe-landry branch, I'm even getting
> arch--geisler--1.0 and arch--devo--1.0 mentionings.
>
>
> User error or feature? Please enlighten me. ;)
As far as I can tell, it is either a misapplication of merge-points,
or a bug in merge-points. new-on-branch uses merge-points to tell
what has already been merged into the tree. But that only includes
direct merges into the current tree, not third party merges into a
tree that was subsequently merged in.
But new-on-branch uses "logs" piped to "log-ls" to find out what has
already been applied, which will include all the third party stuff.
I think the way to fix it is to look at merge-points of merged trees.
For example, merge-points of the dists--landry--1.0 gives me
base-0 lord@regexps.com--2002/dists--devo--1.0--patch-36
Now what new-on-branch should do is look at the merge-points of
dists--devo--1.0. Unfortunately, that seems to require the network to
complete.
So I don't know what the right thing is to do here.
Walter
There is a note in the =TODO (I think), that talks about
memoizing the previous revision history when making a
continuation. It would make branches more complicated, and
there would have to be some way of getting rid of old ones
that you don't care about. Even so, it might be the right
answer.
|