[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?
From: |
Thomas Zander |
Subject: |
Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch? |
Date: |
Mon, 22 Dec 2003 15:31:59 +0100 |
User-agent: |
KMail/1.5.94 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Monday 22 December 2003 15:18, Andrew Suffield wrote:
> The idea was to avoid conflicts in this case:
>
> Original:
> <foo name1="val1" />
>
> Modified1:
> <foo name1="val1" />
> <foo name2="val2" />
>
> Modified2:
> <foo name1="val1" />
> <foo name3="val3" />
>
> When taking the diff from Original to Modified1, and applying it to
> Modified2.
>
> A generic XML diff tool fails *utterly* to comprehend what to do in
> this case. It must throw a conflict and fail.
Could you point out what the expected result would be since I see no
difference between this and the plain-text approach of merging. What is it
that you want to point out?
- --
Thomas Zander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
iD8DBQE/5wBfCojCW6H2z/QRAvWoAJ49qLf18aIJdnyTFf9qv/td6in5ZgCg3RlR
7Ft0R0qM9Jx0wQnaPTx5f60=
=6/PL
-----END PGP SIGNATURE-----
- Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, (continued)
Re: [Gnu-arch-users] File-tpye plug-in architecture for Arch?, Thomas Zander, 2003/12/19
- Re: [Gnu-arch-users] File-tpye plug-in architecture for Arch?, Anselm Lingnau, 2003/12/19
- Re: [Gnu-arch-users] File-tpye plug-in architecture for Arch?, Tom Lord, 2003/12/19
- [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, michael josenhans, 2003/12/21
- Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, Tom Lord, 2003/12/21
- Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, Thomas Zander, 2003/12/22
- Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, Andrew Suffield, 2003/12/22
- Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?,
Thomas Zander <=
- Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, Andrew Suffield, 2003/12/22
- Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, Thomas Zander, 2003/12/22
- Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, Andrew Suffield, 2003/12/22
- Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, Tom Lord, 2003/12/22
- [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, michael josenhans, 2003/12/22
- [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, Tom Lord, 2003/12/22
- Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, Charles Duffy, 2003/12/22
- [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, michael josenhans, 2003/12/22
- [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, Tom Lord, 2003/12/22
- Re: [Gnu-arch-users] Re: File-tpye plug-in architecture for Arch?, Tupshin Harper, 2003/12/22