[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] graphical merges
From: |
Matthew Dempsky |
Subject: |
Re: [Gnu-arch-users] graphical merges |
Date: |
05 Apr 2004 10:02:16 -0500 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 |
Juliusz Chroboczek <address@hidden> writes:
> Is there a detailed description of what star-merge does somewhere? I
> sometimes find its behaviour confusing, and would like to know whether
> it's my brain that's buggy.
star-merge takes your revision and builds the "other" revision that
you want to merge. It then looks through the patch logs to find the
most recent revision shared by both in either's history and calls this
"ancestor." If star-merge was called without -t (--three-way) then a
changeset is computed from "ancestor" to "other," and then applied to
"mine." Otherwise, just a tree-delta (renames, deletes, etc.) is
applied to "mine" based on "ancestor" and "other," and then diff3 -m
is used to merge the contents of files.
-jivera
- Re: [Gnu-arch-users] graphical merges, (continued)
- [Gnu-arch-users] A general way to get a specific revision, Stefan Monnier, 2004/04/03
- Re: [Gnu-arch-users] A general way to get a specific revision, Aaron Bentley, 2004/04/03
- Re: [Gnu-arch-users] graphical merges, Tom Lord, 2004/04/04
- Re: [Gnu-arch-users] graphical merges, Aaron Bentley, 2004/04/04
- Re: [Gnu-arch-users] graphical merges, Tom Lord, 2004/04/04
- Re: [Gnu-arch-users] graphical merges, Aaron Bentley, 2004/04/04
- Re: [Gnu-arch-users] graphical merges, Tom Lord, 2004/04/04
- Re: [Gnu-arch-users] graphical merges, Juliusz Chroboczek, 2004/04/04
- Re: [Gnu-arch-users] graphical merges,
Matthew Dempsky <=
- [Gnu-arch-users] Smart merging [was: graphical merges], Juliusz Chroboczek, 2004/04/05
- Re: [Gnu-arch-users] Fast commits, Robin Farine, 2004/04/03
- [Gnu-arch-users] Re: Fast commits, Stefan Monnier, 2004/04/03
- Re: [Gnu-arch-users] Re: Fast commits, Miles Bader, 2004/04/03
- Re: [Gnu-arch-users] Re: Fast commits, Tom Lord, 2004/04/04
- [Gnu-arch-users] Re: Fast commits, Stefan Monnier, 2004/04/04
- Re: [Gnu-arch-users] Re: Fast commits, Tom Lord, 2004/04/04
- Re: [Gnu-arch-users] Re: Fast commits, Robin Farine, 2004/04/04
- Re: [Gnu-arch-users] Fast commits, Colin Walters, 2004/04/03
- Re: [Gnu-arch-users] Fast commits, Miles Bader, 2004/04/03