Re: [Gnu-arch-users] identical changes conflict

[Peter Conrad]

Hi,

Am Dienstag, 22. März 2005 16:52 schrieb Deliverable Mail:
> Probably it's not typical in
> common non-automated use, but I wonder what's the reasoning there.

the reasoning is that automated tools cannot tell what's the correct
behaviour.

> In case you don't follow all that mumbo-jumbo with multiple SCMs,
> here's a simple, purely tla case.  Create a local repo and mirror it
> in a remote repo.  Create a text file in one repo and sync it into
> another.  Now do this: add a line to the file in the local repo and
> commit.  Then go to the remote, ADD THE SAME LINE MANUALLY BEFORE
> SYNCING, so that the files are now in fact identical in source but not
> as recorded in the auxiliary tla directories.  Now tla update --
> you'll get file.orig <=> file, and file.rej showing +<line> in diff.
> If tla were to check that the result of aplying file.rej to the last
> commit would indeed yield the file <=> file.orig, perhaps it might see
> there's no conflict and not bother with it?

But there *is* a conflict. Maybe you *want* the line to be added twice.
How should tla know?

Bye,
        Peter
-- 
Peter Conrad                        Tel: +49 6102 / 80 99 072
[ t]ivano Software GmbH             Fax: +49 6102 / 80 99 071
Bahnhofstr. 18                      http://www.tivano.de/
63263 Neu-Isenburg

Germany