[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: conflict detection with 1.11.17 client and 1.11.21 server?
From: |
Mark D. Baushke |
Subject: |
Re: conflict detection with 1.11.17 client and 1.11.21 server? |
Date: |
Wed, 06 Sep 2006 18:32:12 -0700 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Dylan Alex Simon <dylan@dylex.net> writes:
> Apologies if this has already been covered but I
> don't see any obvious note about it.
>
> If I do something which generates a conflict,
> and then immediately try to commit, when using
> older servers or newer clients, I correctly get
> the "file `' had a conflict and has not been
> modified" message. However, when using an older
> client on the newer server, I get just a warning
> "file `' seems to still contain conflict
> indicators", as if it's not detecting the
> matching timestamps correctly.
>
> Are there any plans to fix this incompatibility
> with a newer server version, or is this just an
> unfortunate byproduct of the other update
> changes?
>
> :-Dylan
I have not personally seen this problem. Has anyone else?
If so, is it possible to write a step-by-step test case
to reproduce it?
-- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (FreeBSD)
iD8DBQFE/3acCg7APGsDnFERAtFcAKCf24kjdIeM3EOy2jxUa9RSNuj37wCgsTYj
H/Ag69cHEQvJT8gWelsCe2E=
=Brer
-----END PGP SIGNATURE-----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: conflict detection with 1.11.17 client and 1.11.21 server?,
Mark D. Baushke <=