[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 15:52:20 -0400 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 |
> No, he was proposing munging the trees so that the filenames in ANCESTOR and
> HIS correspond with those in TREE. My own thought was that tla could output
> a list of which files correspond.
But you still need the external tool to know
- how to traverse the trees,
- where to put the result of the merge of each file
- how to report errors
- how to tell tla that the merge added/deleted/moved some files
- ...
I.e. a pretty complete protocol which will probably be tla-specific (since
I don't think such a thing exists yet for other VC tools).
Stefan
- [Gnu-arch-users] Graphical merges, Matthieu Moy, 2004/04/20
- Re: [Gnu-arch-users] Graphical merges, Matthieu Moy, 2004/04/20
- [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, 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, 2004/04/21