[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: <<< conflict markers
From: |
Tom Lord |
Subject: |
Re: [Gnu-arch-users] Re: <<< conflict markers |
Date: |
Wed, 14 Apr 2004 17:13:00 -0700 (PDT) |
> From: Aaron Bentley <address@hidden>
> Jan Hudec wrote:
>>> But it would have the same effect as `tla star-merge --three-way', so it
>>> would be a bit redundant.
> > But star-merge is far less efficient for this.
> > replay and update would equivalent with three-way merge.
> Update is a three-way merge. It applies the delta between the tree
> revision and your current changes to the latest version in the archive,
> and you get the results in your project tree.
It's a merge with three trees, but not quite a 3-way merge.
E.g., it doesn't, strictly speaking, need to build the common ancestor
to achieve it's effect.
It's basically just "redo my tree-local changes against a revision
that happens to have a common ancestor with my tree".
(But, again, an update-like (i.e., using those same 3 trees) 3-way
merge could be handy.)
My intuition is that it's high time to make a taxonomy of all possible
merge commands but I'm still a bit busy moving.
-t
- Re: [Gnu-arch-users] <<< conflict markers, (continued)
- Re: [Gnu-arch-users] <<< conflict markers, Tom Lord, 2004/04/14
- Re: [Gnu-arch-users] <<< conflict markers, Jan Hudec, 2004/04/14
- [Gnu-arch-users] Re: <<< conflict markers, Stefan Monnier, 2004/04/14
- Re: [Gnu-arch-users] Re: <<< conflict markers, Jan Hudec, 2004/04/14
- Re: [Gnu-arch-users] Re: <<< conflict markers, Stefan Monnier, 2004/04/14
- Re: [Gnu-arch-users] Re: <<< conflict markers, Jan Hudec, 2004/04/14
- Re: [Gnu-arch-users] Re: <<< conflict markers, Aaron Bentley, 2004/04/15
- [Gnu-arch-users] Re: <<< conflict markers, Miles Bader, 2004/04/15
- Re: [Gnu-arch-users] Re: <<< conflict markers, Aaron Bentley, 2004/04/14
- Re: [Gnu-arch-users] Re: <<< conflict markers,
Tom Lord <=
- Re: [Gnu-arch-users] Re: <<< conflict markers, Aaron Bentley, 2004/04/15
- Re: [Gnu-arch-users] Re: <<< conflict markers, Stefan Monnier, 2004/04/15
- Re: [Gnu-arch-users] Re: <<< conflict markers, Tom Lord, 2004/04/15
- Re: [Gnu-arch-users] Re: <<< conflict markers, Aaron Bentley, 2004/04/15
- Re: [Gnu-arch-users] Re: <<< conflict markers, Tom Lord, 2004/04/15
- Re: [Gnu-arch-users] Re: <<< conflict markers, Aaron Bentley, 2004/04/15
- Re: [Gnu-arch-users] Re: <<< conflict markers, Tom Lord, 2004/04/16
- Re: [Gnu-arch-users] Re: <<< conflict markers, Aaron Bentley, 2004/04/16
- Re: [Gnu-arch-users] Re: <<< conflict markers, Stefan Monnier, 2004/04/16
- Message not available
- Re: [Gnu-arch-users] Re: <<< conflict markers, Benoit Poulot-Cazajous, 2004/04/22