[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: Graphical merges
From: |
Stefan Monnier |
Subject: |
Re: [Gnu-arch-users] Re: Graphical merges |
Date: |
21 Apr 2004 17:58:06 -0400 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 |
>>>> Basically, instead of 3 trees, I'd rather have 1 tree where each changed
>>>> <file> is replaced by something like <file>.orig, <file>.ancestor, and
>>>> <file>.new. We'd also invent some way to represent file move/add/delete.
>>>> Then the merge can be done file-by-file with an obviously
>>>> fail-safe behavior.
>>>
>>> You mean, not operate in the project tree at all, so you can't hurt it.
>> No: the "1 tree" would be the project tree.
> So you're proposing renaming all files that changed in HIS to <file>.orig?
For example. It could also keep the HIS in place and only add .ancestor (or
.orig) and .new. I don't care much about such details.
Stefan
- Re: [Gnu-arch-users] Re: Graphical merges, (continued)
- Re: [Gnu-arch-users] Re: Graphical merges, Stefan Monnier, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges, Aaron Bentley, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges, Stefan Monnier, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges, Aaron Bentley, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges, Matthieu Moy, 2004/04/21
- [Gnu-arch-users] Librification of libarch, Matthew Dempsky, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges, Stefan Monnier, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges, Aaron Bentley, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges, Stefan Monnier, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges, Aaron Bentley, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges,
Stefan Monnier <=
- Re: [Gnu-arch-users] Re: Graphical merges, Tom Lord, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges, Stefan Monnier, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges, Matthew Dempsky, 2004/04/21
- Re: [Gnu-arch-users] Re: Graphical merges, Tom Lord, 2004/04/21
Re: [Gnu-arch-users] Re: Graphical merges, Matthieu Moy, 2004/04/21