Deliverable Mail wrote:
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?
tla can use --three-way for star-merge, which will handle such
situations gracefully.
baz
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
As I described before, I test an SCM Carnival setup where several
distributed SCMs, such as tla, darcs, and bk, coexist in the same
directory. Update/commit/pull cycle involves calling each SCM's
corresponding command in sequence. Commit is not a problem, as
changes route into their respective SC
