[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Smart Merging with Multiple Branches From a Common
Re: [Gnu-arch-users] Smart Merging with Multiple Branches From a Common Ancestor
Mon, 8 Sep 2003 18:28:45 -0700 (PDT)
> From: John Goerzen <address@hidden>
> I'm going to try to explain this question that's a little fuzzy in my
> head as clearly as possible. Please ask if I fail :-)
I think you want to use the --reference option to star-merge when
merging into baz from foo and bar (`--reference mainline').
I also suspect that when you created foo--patch-3, you really wanted
to do something like:
tla get mainline--patch-2 wd
tla sync-tree foo
tla set-tree-version foo
but it really comes down to what you want to see in `whats-missing'