mercurial status and keyword extension problem

[Christian Ebert]

Hi George,

* George Feinberg on Tuesday, September 16, 2008 at 11:45:17 -0400
> I am seeing odd Mercurial behavior.  I'm using version 1.0.2 on OS X  
> Leopard.
> I am using multiple branches in a single repository.
> 
> Problem (names changed):
> 
> I clone the repository to a branch:
> hg clone -r xyz_branch myrepo mynewrepo
> cd mynewrepo
> hg update -r xyz_branch
> 
> Then I do this:
> hg status
> 
> And some number of the files appear as modified.  These files cannot  
> be reverted (revert "works" but doesn't
> change the status).  hg diff on the files show no changes.
> 
> HOWEVER... I did some debugging.  First, I changed my version
> of Mercurial to 0.95 plus -- from mercurial.berkwood.com:
> (2008-02-25: Version 0.9.5 + fixes through 2008-02-25
>          * Mercurial 0.9.5-434139080ed4 for OS X 10.5
> 
> Interestingly, for already-created clones it has the same
> behavior as 1.0.2, but when I created new clones they were fine.

$ hg --version
Mercurial Distributed SCM (version 434139080ed4)

Copyright (C) 2005-2008 Matt Mackall <mpm at selenic.com> and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
$ hg showconfig keyword
keyword.**=
$ hg init a
$ cd a
$ echo '$Id$' > x
$ echo hello >> x
$ hg ci -Am hello
adding x
$ echo world >> x
$ hg ci -m world
$ hg co 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branch mybranch
marked working directory as branch mybranch
$ hg ci -m 'start mybranch'
$ echo good-bye >> x
$ hg ci -m good-bye
$ cd ..
$ hg --version
Mercurial Distributed SCM (version 1.0.2)

Copyright (C) 2005-2008 Matt Mackall <mpm at selenic.com> and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
$ hg clone -r mybranch a b
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 1 files
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd b
$ hg up -r mybranch
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st
$ cat x
$Id: x,v c4bc68f9011b 2008/09/17 14:34:54 blacktrash $
hello
good-bye


So, I can't reproduce it. If you can could up with a small
failing example? You can also contact me via pm.
 
> I then tried committing the "modified" files.  This worked and
> lo and behold, there was a diff (hg outgoing -p) entirely
> related to keyword expansion (or not).  My repository definitely has  
> $Id$ keywords
> (from CVS originally).

Did you convert from cvs? With "hg convert"?

c
-- 
  Was heißt hier Dogma, ich bin Underdogma!
[ What the hell do you mean dogma, I am underdogma. ]

_F R E E_  _V I D E O S_  -->>  http://www.blacktrash.org/underdogma/