diff disagrees with status

[Bela Babik]

Hi,

Your problem: the timestamp is different in the two branch, that can
explain why status says they are different. But the content is the
same (which doesn't mean that they weren't changed, just have the same
content).
Have you tried git=true in the config? (but I think timestamp
differences will never show up in diffs)

My experiences with a similar workflow:

I am in the same situation but SourceSafe instead of Perforce.

What I am doing is:
- We are using Visual Studio. SourceSafe is integrated, but can be set
to "disconnected" mode, which means it will not check out anything
just makes files writable.
- my changes are in a MQ patch
- managing changes coming from VSS are in a patch too. (It's just much
more natural)
- Wrote a few scripts which are handling the write only problem for
me. (remove or add read only flag based on the status of the file in
mercurial)


The problem with a pure mercurial workflow:
- two branches: vss, work
- vss branch is ok, easy to maintain
- work branch is ~ok, I just need to remove read only flags (done by
the IDE automatically)
- merge work into vss: fails
Reason: even if I did not touch a file, but was updated in the VSS
branch, it will be read only.
Solution: remove read only flag from every file which been modified in
any of the branches and then put it back for files which were changed
only in the VSS branch.

teki